diff --git a/.build-cache-buster b/.build-cache-buster
new file mode 100644
index 000000000..675e77beb
--- /dev/null
+++ b/.build-cache-buster
@@ -0,0 +1 @@
+Di. 31 März 2026 01:21:52 CEST
diff --git a/.dockerignore b/.dockerignore
index d26dfabb5..afbfc0dca 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,7 @@
 node_modules
-.next
+**/.next
 .turbo
+**/.turbo
 .git
 *.md
 .env*
@@ -10,3 +11,8 @@ apps/dev-tool
 .gitnexus
 .gsd
 .claude
+.gemini
+.junie
+.github
+docs
+**/*.tsbuildinfo
diff --git a/.env b/.env
new file mode 100644
index 000000000..179a63669
--- /dev/null
+++ b/.env
@@ -0,0 +1,23 @@
+# =====================================================
+# MyEasyCMS v2 — Local Development Environment
+# Auto-generated — Mo. 30 März 2026 17:11:01 CEST
+# =====================================================
+
+POSTGRES_PASSWORD=BqgGAwNuKeZZtaE2VJRAkxR48zj9XVw
+JWT_SECRET=BhD5zXZXcdI23FtNk9kIeGN5z06UQ1fZUhCLvMr6
+
+SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlzcyI6InN1cGFiYXNlIiwiaWF0IjoxNzc0ODgzNDYwLCJleHAiOjIwOTAyNDM0NjB9.hbeQae1gYRTcJQ_6m7MPjoDlYFhp4tsszEQD2g5q6vY
+SUPABASE_SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoic2VydmljZV9yb2xlIiwiaXNzIjoic3VwYWJhc2UiLCJpYXQiOjE3NzQ4ODM0NjAsImV4cCI6MjA5MDI0MzQ2MH0.gqAnWDmPmnf-XMA9FcIKGo7qVVxtJw5UvSsTlTup3Ns
+
+SITE_URL=http://localhost:3000
+APP_PORT=3000
+
+KONG_HTTP_PORT=8000
+KONG_HTTPS_PORT=8443
+API_EXTERNAL_URL=http://localhost:8000
+
+ENABLE_EMAIL_AUTOCONFIRM=true
+DISABLE_SIGNUP=false
+JWT_EXPIRY=3600
+
+DB_WEBHOOK_SECRET=local-dev-webhook-secret
diff --git a/.env.production.example b/.env.production.example
index f801bc32b..a79d41842 100644
--- a/.env.production.example
+++ b/.env.production.example
@@ -1,10 +1,12 @@
 # =====================================================
-# MyEasyCMS v2 — Environment Variables
+# MyEasyCMS v2 — Environment Variables (Production)
 # Copy to .env and fill in your values
 # =====================================================
 
-# --- Supabase ---
+# --- Supabase Database ---
 POSTGRES_PASSWORD=change-me-to-a-strong-password
+
+# --- Supabase Auth ---
 JWT_SECRET=change-me-to-at-least-32-characters-long-secret
 
 # Generate these with: npx supabase gen keys
@@ -15,11 +17,17 @@ SUPABASE_SERVICE_ROLE_KEY=your-service-role-key-here
 SITE_URL=https://myeasycms.de
 APP_PORT=3000
 
-# --- Kong ---
+# --- Kong (API Gateway) ---
 KONG_HTTP_PORT=8000
 KONG_HTTPS_PORT=8443
 API_EXTERNAL_URL=https://api.myeasycms.de
 
+# --- Studio (Dashboard) ---
+STUDIO_PORT=54323
+
+# --- Inbucket (Email testing — dev only) ---
+INBUCKET_PORT=54324
+
 # --- Email (SMTP) ---
 SMTP_HOST=smtp.example.com
 SMTP_PORT=587
@@ -27,7 +35,7 @@ SMTP_USER=noreply@myeasycms.de
 SMTP_PASS=your-smtp-password
 SMTP_ADMIN_EMAIL=admin@myeasycms.de
 
-# --- Auth ---
+# --- Auth Settings ---
 ENABLE_EMAIL_AUTOCONFIRM=false
 DISABLE_SIGNUP=false
 JWT_EXPIRY=3600
diff --git a/Dockerfile b/Dockerfile
index 875c24f4e..b70083d30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,23 +2,15 @@ FROM node:22-alpine AS base
 RUN corepack enable && corepack prepare pnpm@latest --activate
 WORKDIR /app
 
-# --- Install deps ---
-FROM base AS deps
-COPY pnpm-lock.yaml pnpm-workspace.yaml package.json ./
-COPY apps/web/package.json ./apps/web/
-COPY apps/dev-tool/package.json ./apps/dev-tool/
-COPY tooling/ ./tooling/
-COPY packages/ ./packages/
-RUN pnpm install --frozen-lockfile
-
-# --- Build ---
+# --- Install + Build in one stage ---
 FROM base AS builder
-COPY --from=deps /app/ ./
+ARG CACHE_BUST=1
 COPY . .
+RUN pnpm install --no-frozen-lockfile
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV NEXT_PUBLIC_SITE_URL=https://myeasycms.de
-ENV NEXT_PUBLIC_SUPABASE_URL=placeholder
-ENV NEXT_PUBLIC_SUPABASE_PUBLIC_KEY=placeholder
+ENV NEXT_PUBLIC_SUPABASE_URL=http://localhost:8000
+ENV NEXT_PUBLIC_SUPABASE_PUBLIC_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlzcyI6InN1cGFiYXNlIiwiaWF0IjoxNzc0ODgzNDYwLCJleHAiOjIwOTAyNDM0NjB9.hbeQae1gYRTcJQ_6m7MPjoDlYFhp4tsszEQD2g5q6vY
 RUN pnpm --filter web build
 
 # --- Run ---
diff --git a/QA_TEST_PLAN.md b/QA_TEST_PLAN.md
new file mode 100644
index 000000000..755445a9a
--- /dev/null
+++ b/QA_TEST_PLAN.md
@@ -0,0 +1,501 @@
+# MyEasyCMS v2 — Comprehensive QA Test Plan
+
+## Test Environment
+- App: localhost:3000 (Docker)
+- Supabase: localhost:8000 (Kong gateway)
+- Studio: localhost:54323
+- DB: supabase/postgres:15.8.1.060
+
+## Test Accounts
+| Email | Password | Role | Team |
+|-------|----------|------|------|
+| super-admin@makerkit.dev | testingpassword | Super Admin | - |
+| test@makerkit.dev | testingpassword | Owner | Makerkit |
+| owner@makerkit.dev | testingpassword | Owner | Makerkit |
+| member@makerkit.dev | testingpassword | Member | Makerkit |
+| custom@makerkit.dev | testingpassword | Custom | Makerkit |
+
+## Test Categories
+
+### A. Authentication & Authorization (12 tests)
+### B. Public Pages (8 tests)
+### C. Team Dashboard & Navigation (10 tests)
+### D. Member Management CRUD (15 tests)
+### E. Course Management CRUD (10 tests)
+### F. Event Management CRUD (8 tests)
+### G. Document Generation (8 tests)
+### H. Newsletter System (6 tests)
+### I. Site Builder & Public Club Pages (12 tests)
+### J. Finance / SEPA (6 tests)
+### K. Fischerei Module (12 tests)
+### L. Sitzungsprotokolle Module (8 tests)
+### M. Verbandsverwaltung Module (8 tests)
+### N. Module Activation System (6 tests)
+### O. Admin Panel (8 tests)
+### P. Public Registration APIs (9 tests)
+### Q. Edge Cases & Error Handling (10 tests)
+### R. Permission Boundaries (8 tests)
+
+Total: ~156 test cases
+
+---
+
+## A. AUTHENTICATION & AUTHORIZATION
+
+### A1. Login — Valid credentials
+- Setup: Logged out
+- Steps: Navigate /auth/sign-in, enter test@makerkit.dev / testingpassword, submit
+- Expected: Redirect to /home, user avatar visible
+- Pass: URL contains /home, no error toast
+
+### A2. Login — Invalid password
+- Setup: Logged out
+- Steps: Enter test@makerkit.dev / wrongpassword, submit
+- Expected: Error message, stays on sign-in page
+- Pass: Error alert visible, URL still /auth/sign-in
+
+### A3. Login — Empty fields
+- Steps: Click submit without entering anything
+- Expected: Client-side validation prevents submit
+- Pass: Form doesn't submit, validation indicators shown
+
+### A4. Login — SQL injection attempt
+- Steps: Enter ' OR 1=1-- as email
+- Expected: Validation error (not valid email format)
+- Pass: No crash, proper error message
+
+### A5. Registration — Valid
+- Steps: Navigate /auth/sign-up, enter unique email, password >= 6 chars, matching repeat
+- Expected: Account created, redirect to /home
+- Pass: User exists in DB, logged in
+
+### A6. Registration — Duplicate email
+- Steps: Try registering with test@makerkit.dev
+- Expected: "Diese Anmeldedaten werden bereits verwendet"
+- Pass: Error shown, no crash
+
+### A7. Registration — Weak password
+- Steps: Enter password "123"
+- Expected: Validation error (too short)
+- Pass: Form doesn't submit
+
+### A8. Registration — Mismatched passwords
+- Steps: Enter different passwords in password and repeat fields
+- Expected: Validation error
+- Pass: Form shows mismatch error
+
+### A9. Session persistence
+- Steps: Login, close tab, open new tab to /home
+- Expected: Still logged in
+- Pass: Dashboard loads, not redirected to sign-in
+
+### A10. Logout
+- Steps: Click account dropdown > "Abmelden"
+- Expected: Session cleared, redirect to sign-in
+- Pass: Accessing /home redirects to /auth/sign-in
+
+### A11. Protected route — unauthenticated access
+- Steps: Clear cookies, navigate to /home/makerkit
+- Expected: Redirect to /auth/sign-in
+- Pass: URL changes to sign-in
+
+### A12. Admin route — non-admin access
+- Steps: Login as member@makerkit.dev, navigate to /admin
+- Expected: 404 (AdminGuard returns notFound)
+- Pass: 404 page shown
+
+---
+
+## B. PUBLIC PAGES
+
+### B1. Landing page loads with real content
+- Expected: "Vereinsverwaltung, die mitwächst", "69.000", "SEPA"
+- Pass: No placeholder/filler text
+
+### B2. Pricing page
+- Navigate /pricing
+- Expected: Pricing table renders
+
+### B3. FAQ page
+- Navigate /faq
+- Expected: FAQ items render
+
+### B4. Contact page
+- Navigate /contact
+- Expected: Contact form with name/email/message fields
+
+### B5. Blog page
+- Navigate /blog
+- Expected: Blog listing (may be empty)
+
+### B6. Legal pages (privacy, terms, cookies)
+- Navigate /privacy-policy, /terms-of-service, /cookie-policy
+- Expected: Each loads without error
+
+### B7. Public club page
+- Navigate /club/makerkit
+- Expected: Club homepage with Puck content
+- Pass: Real data (courses, events) shown, not placeholders
+
+### B8. Non-existent club page
+- Navigate /club/nonexistent
+- Expected: 404 page
+- Pass: Proper 404, no crash
+
+---
+
+## C. TEAM DASHBOARD & NAVIGATION
+
+### C1. Team dashboard loads with stats
+- Login as test@makerkit.dev, navigate /home/makerkit
+- Expected: 4 stat cards, quick actions, activity feed
+- Pass: Numbers render (even if 0)
+
+### C2. All sidebar links work
+- Click each sidebar item: Dashboard, Module, Mitglieder, Kurse, Veranstaltungen, Finanzen, Dokumente, Newsletter, Website
+- Expected: Each page loads without error
+
+### C3. Account switcher
+- Click account dropdown > "Arbeitsbereich wechseln"
+- Expected: Shows list of accounts
+
+### C4. Team settings — rename
+- Navigate /home/makerkit/settings
+- Expected: Team name editable, save works
+
+### C5. Team members list
+- Navigate /home/makerkit/members
+- Expected: Shows 4 members with roles
+
+### C6. Non-existent team slug
+- Navigate /home/nonexistent
+- Expected: Redirect or error page
+
+### C7. Profile settings
+- Navigate /home/settings (personal)
+- Expected: Name, language, email change form
+
+### C8. Theme toggle
+- Click theme toggle in nav
+- Expected: Dark/light theme switches
+
+### C9. Breadcrumb navigation
+- Navigate to nested page, click breadcrumb links
+- Expected: Navigate back correctly
+
+### C10. Mobile responsive (viewport 375px)
+- Resize to mobile
+- Expected: Sidebar collapses, hamburger menu works
+
+---
+
+## D. MEMBER MANAGEMENT CRUD
+
+### D1. List members — empty state
+- Navigate /home/makerkit/members-cms
+- Expected: Shows "1 Mitglieder insgesamt" (Max Mustermann from earlier test)
+
+### D2. Create member — all fields
+- Navigate /home/makerkit/members-cms/new
+- Fill: Vorname=Anna, Nachname=Schmidt, Email=anna@test.de, PLZ=93047, Ort=Regensburg
+- Expected: Member created, redirect to list
+
+### D3. Create member — required fields only
+- Fill: Vorname=Test, Nachname=Minimal
+- Expected: Created successfully
+
+### D4. Create member — empty required fields
+- Submit with empty Vorname
+- Expected: Validation error
+
+### D5. Create member — invalid email format
+- Enter email "notanemail"
+- Expected: Validation error
+
+### D6. Create member — duplicate email
+- Create member with same email as existing
+- Expected: DB constraint error or validation
+
+### D7. View member detail
+- Click on member name in list
+- Expected: Detail page with all fields
+
+### D8. Edit member
+- Navigate to member edit page
+- Change Vorname, save
+- Expected: Updated in DB and UI
+
+### D9. Search members
+- Type in search box
+- Expected: List filters in real-time or on submit
+
+### D10. Filter by status
+- Use status dropdown
+- Expected: Only matching members shown
+
+### D11. Member with SEPA mandate
+- Create member with IBAN field filled
+- Expected: IBAN saved correctly
+
+### D12. Member import
+- Navigate /home/makerkit/members-cms/import
+- Expected: Import wizard loads
+
+### D13. Member statistics
+- Navigate /home/makerkit/members-cms/statistics
+- Expected: Statistics page loads
+
+### D14. Member departments
+- Navigate /home/makerkit/members-cms/departments
+- Expected: Department management page
+
+### D15. Pagination
+- With many members, verify pagination controls work
+
+---
+
+## E. COURSE MANAGEMENT
+
+### E1. Course list — shows existing course
+- Navigate /home/makerkit/courses
+- Expected: "Schwimmkurs Anfänger" visible
+
+### E2. Create course — valid
+- Navigate /home/makerkit/courses/new
+- Fill required fields, submit
+- Expected: Created, redirect to courses list
+
+### E3. Course detail
+- Click on course name
+- Expected: Detail page with participants, schedule
+
+### E4. Course calendar
+- Navigate /home/makerkit/courses/calendar
+- Expected: Calendar view loads
+
+### E5. Course categories
+- Navigate /home/makerkit/courses/categories
+- Expected: Category management page
+
+### E6. Course instructors
+- Navigate /home/makerkit/courses/instructors
+- Expected: Instructor list
+
+### E7. Course locations
+- Navigate /home/makerkit/courses/locations
+- Expected: Location management
+
+### E8. Course statistics
+- Navigate /home/makerkit/courses/statistics
+- Expected: Statistics page loads
+
+### E9. Course participants
+- Navigate to course > participants tab
+- Expected: Participant list (may be empty)
+
+### E10. Course attendance
+- Navigate to course > attendance tab
+- Expected: Attendance tracking page
+
+---
+
+## G. DOCUMENT GENERATION
+
+### G1. Document type selection page
+- Navigate /home/makerkit/documents
+- Expected: 6 document types shown
+
+### G2. Generate member cards (PDF)
+- Select Mitgliedsausweis, fill title, click Generieren
+- Expected: PDF downloads with .pdf extension
+- Pass: File downloads, success banner shown
+
+### G3. Generate labels (HTML)
+- Select Etiketten, fill title, click Generieren
+- Expected: HTML file downloads with .html extension
+
+### G4. Generate report (Excel)
+- Select Bericht, fill title, click Generieren
+- Expected: XLSX downloads with .xlsx extension
+
+### G5. Coming soon types (invoice, letter, certificate)
+- Select Rechnung
+- Expected: "Demnächst verfügbar" banner, button disabled
+
+### G6. Generate with empty title
+- Leave title blank, try to submit
+- Expected: Validation prevents submit (required field)
+
+### G7. Generate with no members
+- Create new account with no members, try generating
+- Expected: Error "Keine aktiven Mitglieder"
+
+### G8. Document templates page
+- Navigate /home/makerkit/documents/templates
+- Expected: Page loads, shows empty state
+
+---
+
+## I. SITE BUILDER & PUBLIC CLUB PAGES
+
+### I1. Site builder list
+- Navigate /home/makerkit/site-builder
+- Expected: Shows pages list (hello, Über uns)
+
+### I2. Create new page
+- Navigate /home/makerkit/site-builder/new
+- Fill title + slug, submit
+- Expected: Page created, Puck editor opens
+
+### I3. Site builder settings
+- Navigate /home/makerkit/site-builder/settings
+- Expected: Design settings (name, colors, font, publish toggle)
+
+### I4. Public page — published
+- Navigate /club/makerkit/hello
+- Expected: Puck content renders
+
+### I5. Public page — unpublished
+- Navigate /club/makerkit/ueber-uns
+- Expected: 404 (not published)
+
+### I6. Public page — non-existent
+- Navigate /club/makerkit/nonexistent
+- Expected: 404
+
+### I7. Course data on public page
+- /club/makerkit should show "Schwimmkurs Anfänger"
+- Expected: Real course data, not placeholders
+
+### I8. Course registration form
+- Click "Anmelden" on a course on the public page
+- Fill form, submit
+- Expected: "Anmeldung erfolgreich!" message
+
+### I9. Event registration (no events)
+- EventList block should show "Keine anstehenden Veranstaltungen"
+
+### I10. Membership application form
+- Fill "Mitglied werden" form on public page
+- Submit with valid data
+- Expected: Application saved in DB
+
+### I11. Membership application — invalid email
+- Submit with invalid email
+- Expected: Client-side validation error
+
+### I12. Newsletter signup
+- Use newsletter signup block
+- Expected: Subscription created or error
+
+---
+
+## N. MODULE ACTIVATION SYSTEM
+
+### N1. Module toggles page shows all modules
+- Navigate /home/makerkit/modules
+- Expected: Fischerei, Sitzungsprotokolle, Verbandsverwaltung toggles visible
+
+### N2. Activate Fischerei
+- Toggle Fischerei ON
+- Expected: "Fischerei" appears in sidebar
+
+### N3. Deactivate Fischerei
+- Toggle Fischerei OFF
+- Expected: "Fischerei" disappears from sidebar
+
+### N4. Activate Sitzungsprotokolle
+- Toggle ON
+- Expected: "Sitzungsprotokolle" appears in sidebar
+
+### N5. Activate Verbandsverwaltung
+- Toggle ON
+- Expected: "Verbandsverwaltung" appears in sidebar
+
+### N6. Direct URL access to deactivated module
+- Deactivate Fischerei, navigate /home/makerkit/fischerei
+- Expected: Page still loads (data exists) but not in sidebar
+
+---
+
+## P. PUBLIC REGISTRATION APIS
+
+### P1. Course registration — valid
+- POST /api/club/course-register with valid courseId, name, email
+- Expected: 200 { success: true }
+
+### P2. Course registration — missing fields
+- POST without email
+- Expected: 400 error
+
+### P3. Course registration — invalid courseId
+- POST with random UUID
+- Expected: DB error or 500
+
+### P4. Event registration — valid
+- POST /api/club/event-register with valid data
+- Expected: 200 success (need an event first)
+
+### P5. Membership application — valid
+- POST /api/club/membership-apply with all fields
+- Expected: Row inserted in membership_applications
+
+### P6. Membership application — invalid email
+- POST with email "notanemail"
+- Expected: 400 validation error
+
+### P7. Membership application — missing accountId
+- POST without accountId
+- Expected: Error
+
+### P8. Rate limiting (if any)
+- Send 100 rapid POSTs
+- Expected: No crash (may or may not rate limit)
+
+### P9. XSS in form fields
+- Submit <script>alert(1)</script> as firstName
+- Expected: Stored as text, not executed on render
+
+---
+
+## Q. EDGE CASES & ERROR HANDLING
+
+### Q1. API healthcheck
+- GET /api/healthcheck
+- Expected: { services: { database: true } }
+
+### Q2. 404 for unknown route
+- Navigate /nonexistent
+- Expected: 404 page with "Seite nicht gefunden"
+
+### Q3. Direct DB access via PostgREST (anon)
+- GET localhost:8000/rest/v1/members (anon key, no auth)
+- Expected: Empty array (RLS blocks anon)
+
+### Q4. JWT expiration handling
+- Login, wait for token expiry (3600s), try action
+- Expected: Auto-refresh or redirect to login
+
+### Q5. Concurrent writes
+- Two users edit same member simultaneously
+- Expected: Last write wins, no crash
+
+### Q6. Very long text input
+- Enter 10000 char string in a text field
+- Expected: Validation limits or graceful handling
+
+### Q7. Unicode/emoji in names
+- Create member with name "Müller-Lüdenscheidt 🎣"
+- Expected: Saved and displayed correctly
+
+### Q8. Browser back button
+- Navigate deep, press back
+- Expected: Previous page loads correctly
+
+### Q9. Double form submission
+- Click submit twice rapidly
+- Expected: Only one record created (isPending disables button)
+
+### Q10. Network disconnect during submit
+- Submit form, disconnect network mid-request
+- Expected: Error message, no partial data corruption
diff --git a/apps/web/app/[locale]/club/[slug]/[...page]/page.tsx b/apps/web/app/[locale]/club/[slug]/[...page]/page.tsx
index 1756eb8d4..a750b2d94 100644
--- a/apps/web/app/[locale]/club/[slug]/[...page]/page.tsx
+++ b/apps/web/app/[locale]/club/[slug]/[...page]/page.tsx
@@ -1,6 +1,7 @@
 import { createClient } from '@supabase/supabase-js';
 import { notFound } from 'next/navigation';
 import { SiteRenderer } from '@kit/site-builder/components';
+import type { SiteData } from '@kit/site-builder/context';
 
 interface Props { params: Promise<{ slug: string; page: string[] }> }
 
@@ -23,9 +24,26 @@ export default async function ClubSubPage({ params }: Props) {
     .eq('account_id', account.id).eq('slug', pageSlug).eq('is_published', true).maybeSingle();
   if (!sitePageData) notFound();
 
+  // Pre-fetch CMS data for Puck components
+  const [eventsRes, coursesRes, postsRes] = await Promise.all([
+    supabase.from('events').select('id, name, event_date, event_time, location, fee, status')
+      .eq('account_id', account.id).order('event_date', { ascending: true }).limit(20),
+    supabase.from('courses').select('id, name, start_date, end_date, fee, capacity, status')
+      .eq('account_id', account.id).order('start_date', { ascending: true }).limit(20),
+    supabase.from('cms_posts').select('id, title, excerpt, cover_image, published_at, slug')
+      .eq('account_id', account.id).eq('status', 'published').order('published_at', { ascending: false }).limit(20),
+  ]);
+
+  const siteData: SiteData = {
+    accountId: account.id,
+    events: eventsRes.data ?? [],
+    courses: (coursesRes.data ?? []).map(c => ({ ...c, enrolled_count: 0 })),
+    posts: postsRes.data ?? [],
+  };
+
   return (
     <div style={{ '--primary': settings.primary_color, fontFamily: settings.font_family } as React.CSSProperties}>
-      <SiteRenderer data={(sitePageData.puck_data ?? {}) as Record<string, unknown>} />
+      <SiteRenderer data={(sitePageData.puck_data ?? {}) as Record<string, unknown>} siteData={siteData} />
     </div>
   );
 }
diff --git a/apps/web/app/[locale]/club/[slug]/page.tsx b/apps/web/app/[locale]/club/[slug]/page.tsx
index d5c3eb0e7..eea99aa17 100644
--- a/apps/web/app/[locale]/club/[slug]/page.tsx
+++ b/apps/web/app/[locale]/club/[slug]/page.tsx
@@ -1,34 +1,48 @@
 import { createClient } from '@supabase/supabase-js';
 import { notFound } from 'next/navigation';
 import { SiteRenderer } from '@kit/site-builder/components';
+import type { SiteData } from '@kit/site-builder/context';
 
 interface Props { params: Promise<{ slug: string }> }
 
 export default async function ClubHomePage({ params }: Props) {
   const { slug } = await params;
 
-  // Use anon client for public access
   const supabase = createClient(
     process.env.NEXT_PUBLIC_SUPABASE_URL!,
     process.env.NEXT_PUBLIC_SUPABASE_PUBLIC_KEY!,
   );
 
-  // Resolve slug → account
   const { data: account } = await supabase.from('accounts').select('id, name').eq('slug', slug).single();
   if (!account) notFound();
 
-  // Check site is public
   const { data: settings } = await supabase.from('site_settings').select('*').eq('account_id', account.id).eq('is_public', true).maybeSingle();
   if (!settings) notFound();
 
-  // Get homepage
   const { data: page } = await supabase.from('site_pages').select('*')
     .eq('account_id', account.id).eq('is_homepage', true).eq('is_published', true).maybeSingle();
   if (!page) notFound();
 
+  // Pre-fetch CMS data for Puck components
+  const [eventsRes, coursesRes, postsRes] = await Promise.all([
+    supabase.from('events').select('id, name, event_date, event_time, location, fee, status')
+      .eq('account_id', account.id).order('event_date', { ascending: true }).limit(20),
+    supabase.from('courses').select('id, name, start_date, end_date, fee, capacity, status')
+      .eq('account_id', account.id).order('start_date', { ascending: true }).limit(20),
+    supabase.from('cms_posts').select('id, title, excerpt, cover_image, published_at, slug')
+      .eq('account_id', account.id).eq('status', 'published').order('published_at', { ascending: false }).limit(20),
+  ]);
+
+  const siteData: SiteData = {
+    accountId: account.id,
+    events: eventsRes.data ?? [],
+    courses: (coursesRes.data ?? []).map(c => ({ ...c, enrolled_count: 0 })),
+    posts: postsRes.data ?? [],
+  };
+
   return (
     <div style={{ '--primary': settings.primary_color, '--secondary': settings.secondary_color, fontFamily: settings.font_family } as React.CSSProperties}>
-      <SiteRenderer data={(page.puck_data ?? {}) as Record<string, unknown>} />
+      <SiteRenderer data={(page.puck_data ?? {}) as Record<string, unknown>} siteData={siteData} />
     </div>
   );
 }
diff --git a/apps/web/app/[locale]/home/[account]/_components/team-account-layout-mobile-navigation.tsx b/apps/web/app/[locale]/home/[account]/_components/team-account-layout-mobile-navigation.tsx
index dc162fc99..70d208c25 100644
--- a/apps/web/app/[locale]/home/[account]/_components/team-account-layout-mobile-navigation.tsx
+++ b/apps/web/app/[locale]/home/[account]/_components/team-account-layout-mobile-navigation.tsx
@@ -4,6 +4,7 @@ import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 
 import { Home, LogOut, Menu } from 'lucide-react';
+import * as z from 'zod';
 
 import { AccountSelector } from '@kit/accounts/account-selector';
 import { useSignOut } from '@kit/supabase/hooks/use-sign-out';
@@ -21,11 +22,11 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@kit/ui/dropdown-menu';
+import { NavigationConfigSchema } from '@kit/ui/navigation-schema';
 import { Trans } from '@kit/ui/trans';
 
 import featureFlagsConfig from '~/config/feature-flags.config';
 import pathsConfig from '~/config/paths.config';
-import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.config';
 
 type Accounts = Array<{
   label: string | null;
@@ -43,11 +44,12 @@ export const TeamAccountLayoutMobileNavigation = (
     account: string;
     userId: string;
     accounts: Accounts;
+    config: z.output<typeof NavigationConfigSchema>;
   }>,
 ) => {
   const signOut = useSignOut();
 
-  const Links = getTeamAccountSidebarConfig(props.account).routes.map(
+  const Links = props.config.routes.map(
     (item, index) => {
       if ('children' in item) {
         return item.children.map((child) => {
diff --git a/apps/web/app/[locale]/home/[account]/_components/team-account-layout-sidebar.tsx b/apps/web/app/[locale]/home/[account]/_components/team-account-layout-sidebar.tsx
index 6eae946fc..365bd8e3a 100644
--- a/apps/web/app/[locale]/home/[account]/_components/team-account-layout-sidebar.tsx
+++ b/apps/web/app/[locale]/home/[account]/_components/team-account-layout-sidebar.tsx
@@ -1,11 +1,13 @@
+import * as z from 'zod';
+
 import { JWTUserData } from '@kit/supabase/types';
 import { If } from '@kit/ui/if';
+import { NavigationConfigSchema } from '@kit/ui/navigation-schema';
 import { Sidebar, SidebarContent, SidebarHeader } from '@kit/ui/sidebar';
 
 import type { AccountModel } from '~/components/workspace-dropdown';
 import { WorkspaceDropdown } from '~/components/workspace-dropdown';
 import featureFlagsConfig from '~/config/feature-flags.config';
-import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.config';
 import { TeamAccountNotifications } from '~/home/[account]/_components/team-account-notifications';
 
 import { TeamAccountLayoutSidebarNavigation } from './team-account-layout-sidebar-navigation';
@@ -15,10 +17,10 @@ export function TeamAccountLayoutSidebar(props: {
   accountId: string;
   accounts: AccountModel[];
   user: JWTUserData;
+  config: z.output<typeof NavigationConfigSchema>;
 }) {
-  const { account, accounts, user } = props;
+  const { account, accounts, user, config } = props;
 
-  const config = getTeamAccountSidebarConfig(account);
   const collapsible = config.sidebarCollapsedStyle;
 
   return (
diff --git a/apps/web/app/[locale]/home/[account]/_components/team-account-navigation-menu.tsx b/apps/web/app/[locale]/home/[account]/_components/team-account-navigation-menu.tsx
index 500701d72..5f6695643 100644
--- a/apps/web/app/[locale]/home/[account]/_components/team-account-navigation-menu.tsx
+++ b/apps/web/app/[locale]/home/[account]/_components/team-account-navigation-menu.tsx
@@ -1,13 +1,15 @@
+import * as z from 'zod';
+
 import {
   BorderedNavigationMenu,
   BorderedNavigationMenuItem,
 } from '@kit/ui/bordered-navigation-menu';
 import { If } from '@kit/ui/if';
+import { NavigationConfigSchema } from '@kit/ui/navigation-schema';
 
 import { AppLogo } from '~/components/app-logo';
 import { ProfileAccountDropdownContainer } from '~/components/personal-account-dropdown-container';
 import featureFlagsConfig from '~/config/feature-flags.config';
-import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.config';
 import { TeamAccountAccountsSelector } from '~/home/[account]/_components/team-account-accounts-selector';
 
 // local imports
@@ -16,10 +18,11 @@ import { TeamAccountNotifications } from './team-account-notifications';
 
 export function TeamAccountNavigationMenu(props: {
   workspace: TeamAccountWorkspace;
+  config: z.output<typeof NavigationConfigSchema>;
 }) {
   const { account, user, accounts } = props.workspace;
 
-  const routes = getTeamAccountSidebarConfig(account.slug).routes.reduce<
+  const routes = props.config.routes.reduce<
     Array<{
       path: string;
       label: string;
diff --git a/apps/web/app/[locale]/home/[account]/bookings/[bookingId]/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/[bookingId]/page.tsx
index f156b848f..7fcb11e44 100644
--- a/apps/web/app/[locale]/home/[account]/bookings/[bookingId]/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/bookings/[bookingId]/page.tsx
@@ -21,9 +21,8 @@ import {
   CardTitle,
 } from '@kit/ui/card';
 
-import { createBookingManagementApi } from '@kit/booking-management/api';
-
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string; bookingId: string }>;
@@ -60,9 +59,13 @@ export default async function BookingDetailPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
-
-  const api = createBookingManagementApi(client);
+  if (!acct) {
+    return (
+      <CmsPageShell account={account} title="Buchungsdetails">
+        <AccountNotFound />
+      </CmsPageShell>
+    );
+  }
 
   // Load booking directly
   const { data: booking } = await client
@@ -117,7 +120,6 @@ export default async function BookingDetailPage({ params }: PageProps) {
             </Link>
             <div>
               <div className="flex items-center gap-3">
-                <h1 className="text-2xl font-bold">Buchungsdetails</h1>
                 <Badge variant={STATUS_BADGE_VARIANT[status] ?? 'secondary'}>
                   {STATUS_LABEL[status] ?? status}
                 </Badge>
diff --git a/apps/web/app/[locale]/home/[account]/bookings/calendar/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/calendar/page.tsx
index b7d278dbb..82221898d 100644
--- a/apps/web/app/[locale]/home/[account]/bookings/calendar/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/bookings/calendar/page.tsx
@@ -10,6 +10,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
 import { createBookingManagementApi } from '@kit/booking-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -56,7 +57,13 @@ export default async function BookingCalendarPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) {
+    return (
+      <CmsPageShell account={account} title="Belegungskalender">
+        <AccountNotFound />
+      </CmsPageShell>
+    );
+  }
 
   const api = createBookingManagementApi(client);
 
@@ -128,12 +135,9 @@ export default async function BookingCalendarPage({ params }: PageProps) {
                 <ArrowLeft className="h-4 w-4" />
               </Button>
             </Link>
-            <div>
-              <h1 className="text-2xl font-bold">Belegungskalender</h1>
-              <p className="text-muted-foreground">
-                Zimmerauslastung im Überblick
-              </p>
-            </div>
+            <p className="text-muted-foreground">
+              Zimmerauslastung im Überblick
+            </p>
           </div>
         </div>
 
diff --git a/apps/web/app/[locale]/home/[account]/bookings/guests/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/guests/page.tsx
index cb8abc52d..653a3a699 100644
--- a/apps/web/app/[locale]/home/[account]/bookings/guests/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/bookings/guests/page.tsx
@@ -8,6 +8,7 @@ import { createBookingManagementApi } from '@kit/booking-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -23,7 +24,13 @@ export default async function GuestsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) {
+    return (
+      <CmsPageShell account={account} title="Gäste">
+        <AccountNotFound />
+      </CmsPageShell>
+    );
+  }
 
   const api = createBookingManagementApi(client);
   const guests = await api.listGuests(acct.id);
@@ -32,10 +39,7 @@ export default async function GuestsPage({ params }: PageProps) {
     <CmsPageShell account={account} title="Gäste">
       <div className="flex w-full flex-col gap-6">
         <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-2xl font-bold">Gäste</h1>
-            <p className="text-muted-foreground">Gästeverwaltung</p>
-          </div>
+          <p className="text-muted-foreground">Gästeverwaltung</p>
           <Button>
             <Plus className="mr-2 h-4 w-4" />
             Neuer Gast
diff --git a/apps/web/app/[locale]/home/[account]/bookings/new/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/new/page.tsx
index 822274561..6cb7c4908 100644
--- a/apps/web/app/[locale]/home/[account]/bookings/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/bookings/new/page.tsx
@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createBookingManagementApi } from '@kit/booking-management/api';
 import { CreateBookingForm } from '@kit/booking-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -9,7 +10,13 @@ export default async function NewBookingPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) {
+    return (
+      <CmsPageShell account={account} title="Neue Buchung">
+        <AccountNotFound />
+      </CmsPageShell>
+    );
+  }
 
   const api = createBookingManagementApi(client);
   const rooms = await api.listRooms(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/bookings/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/page.tsx
index 887c39b4c..f5582a6e8 100644
--- a/apps/web/app/[locale]/home/[account]/bookings/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/bookings/page.tsx
@@ -1,22 +1,27 @@
 import Link from 'next/link';
 
-import { BedDouble, CalendarCheck, Plus, Euro } from 'lucide-react';
+import { BedDouble, CalendarCheck, Plus, Euro, Search } from 'lucide-react';
 
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Badge } from '@kit/ui/badge';
 import { Button } from '@kit/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { Input } from '@kit/ui/input';
 
 import { createBookingManagementApi } from '@kit/booking-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
 }
 
+const PAGE_SIZE = 25;
+
 const STATUS_BADGE_VARIANT: Record<
   string,
   'secondary' | 'default' | 'info' | 'outline' | 'destructive'
@@ -37,8 +42,9 @@ const STATUS_LABEL: Record<string, string> = {
   no_show: 'Nicht erschienen',
 };
 
-export default async function BookingsPage({ params }: PageProps) {
+export default async function BookingsPage({ params, searchParams }: PageProps) {
   const { account } = await params;
+  const search = await searchParams;
   const client = getSupabaseServerClient();
 
   const { data: acct } = await client
@@ -47,31 +53,70 @@ export default async function BookingsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) {
+    return (
+      <CmsPageShell account={account} title="Buchungen">
+        <AccountNotFound />
+      </CmsPageShell>
+    );
+  }
+
+  const searchQuery = typeof search.q === 'string' ? search.q : '';
+  const page = Number(search.page) || 1;
 
   const api = createBookingManagementApi(client);
+  const rooms = await api.listRooms(acct.id);
 
-  const [rooms, bookings] = await Promise.all([
-    api.listRooms(acct.id),
-    api.listBookings(acct.id, { page: 1 }),
-  ]);
+  // Fetch bookings with joined room & guest names (avoids displaying raw UUIDs)
+  const bookingsQuery = client
+    .from('bookings')
+    .select(
+      '*, room:rooms(id, room_number, name), guest:guests(id, first_name, last_name)',
+      { count: 'exact' },
+    )
+    .eq('account_id', acct.id)
+    .order('check_in', { ascending: false })
+    .range((page - 1) * PAGE_SIZE, page * PAGE_SIZE - 1);
 
-  const activeBookings = bookings.data.filter(
-    (b: Record<string, unknown>) =>
-      b.status === 'confirmed' || b.status === 'checked_in',
+  const { data: bookingsRaw, count: bookingsTotal } = await bookingsQuery;
+
+  /* eslint-disable @typescript-eslint/no-explicit-any */
+  let bookingsData = (bookingsRaw ?? []) as Array<Record<string, any>>;
+  const total = bookingsTotal ?? 0;
+
+  // Post-filter by search query (guest name or room name/number)
+  if (searchQuery) {
+    const q = searchQuery.toLowerCase();
+    bookingsData = bookingsData.filter((b) => {
+      const room = b.room as Record<string, string> | null;
+      const guest = b.guest as Record<string, string> | null;
+      const roomName = (room?.name ?? '').toLowerCase();
+      const roomNumber = (room?.room_number ?? '').toLowerCase();
+      const guestFirst = (guest?.first_name ?? '').toLowerCase();
+      const guestLast = (guest?.last_name ?? '').toLowerCase();
+      return (
+        roomName.includes(q) ||
+        roomNumber.includes(q) ||
+        guestFirst.includes(q) ||
+        guestLast.includes(q)
+      );
+    });
+  }
+
+  const activeBookings = bookingsData.filter(
+    (b) => b.status === 'confirmed' || b.status === 'checked_in',
   );
 
+  const totalPages = Math.ceil(total / PAGE_SIZE);
+
   return (
     <CmsPageShell account={account} title="Buchungen">
       <div className="flex w-full flex-col gap-6">
         {/* Header */}
         <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-2xl font-bold">Buchungen</h1>
-            <p className="text-muted-foreground">
-              Zimmer und Buchungen verwalten
-            </p>
-          </div>
+          <p className="text-muted-foreground">
+            Zimmer und Buchungen verwalten
+          </p>
 
           <Link href={`/home/${account}/bookings/new`}>
             <Button>
@@ -95,24 +140,61 @@ export default async function BookingsPage({ params }: PageProps) {
           />
           <StatsCard
             title="Gesamt"
-            value={bookings.total}
+            value={total}
             icon={<Euro className="h-5 w-5" />}
           />
         </div>
 
+        {/* Search */}
+        <form className="flex items-center gap-2">
+          <div className="relative max-w-sm flex-1">
+            <Search className="absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+            <Input
+              name="q"
+              defaultValue={searchQuery}
+              placeholder="Gast oder Zimmer suchen…"
+              className="pl-9"
+            />
+          </div>
+          <Button type="submit" variant="secondary" size="sm">
+            Suchen
+          </Button>
+          {searchQuery && (
+            <Link href={`/home/${account}/bookings`}>
+              <Button type="button" variant="ghost" size="sm">
+                Zurücksetzen
+              </Button>
+            </Link>
+          )}
+        </form>
+
         {/* Table or Empty State */}
-        {bookings.data.length === 0 ? (
+        {bookingsData.length === 0 ? (
           <EmptyState
             icon={<BedDouble className="h-8 w-8" />}
-            title="Keine Buchungen vorhanden"
-            description="Erstellen Sie Ihre erste Buchung, um loszulegen."
-            actionLabel="Neue Buchung"
-            actionHref={`/home/${account}/bookings/new`}
+            title={
+              searchQuery
+                ? 'Keine Buchungen gefunden'
+                : 'Keine Buchungen vorhanden'
+            }
+            description={
+              searchQuery
+                ? `Keine Ergebnisse für „${searchQuery}".`
+                : 'Erstellen Sie Ihre erste Buchung, um loszulegen.'
+            }
+            actionLabel={searchQuery ? undefined : 'Neue Buchung'}
+            actionHref={
+              searchQuery ? undefined : `/home/${account}/bookings/new`
+            }
           />
         ) : (
           <Card>
             <CardHeader>
-              <CardTitle>Alle Buchungen ({bookings.total})</CardTitle>
+              <CardTitle>
+                {searchQuery
+                  ? `Ergebnisse (${bookingsData.length})`
+                  : `Alle Buchungen (${total})`}
+              </CardTitle>
             </CardHeader>
             <CardContent>
               <div className="rounded-md border">
@@ -128,51 +210,104 @@ export default async function BookingsPage({ params }: PageProps) {
                     </tr>
                   </thead>
                   <tbody>
-                    {bookings.data.map((booking: Record<string, unknown>) => (
-                      <tr
-                        key={String(booking.id)}
-                        className="border-b hover:bg-muted/30"
-                      >
-                        <td className="p-3">
-                          <Link
-                            href={`/home/${account}/bookings/${String(booking.id)}`}
-                            className="font-medium hover:underline"
-                          >
-                            {String(booking.room_id ?? '—')}
-                          </Link>
-                        </td>
-                        <td className="p-3">
-                          {String(booking.guest_id ?? '—')}
-                        </td>
-                        <td className="p-3">
-                          {booking.check_in
-                            ? new Date(String(booking.check_in)).toLocaleDateString('de-DE')
-                            : '—'}
-                        </td>
-                        <td className="p-3">
-                          {booking.check_out
-                            ? new Date(String(booking.check_out)).toLocaleDateString('de-DE')
-                            : '—'}
-                        </td>
-                        <td className="p-3">
-                          <Badge
-                            variant={
-                              STATUS_BADGE_VARIANT[String(booking.status)] ?? 'secondary'
-                            }
-                          >
-                            {STATUS_LABEL[String(booking.status)] ?? String(booking.status)}
-                          </Badge>
-                        </td>
-                        <td className="p-3 text-right">
-                          {booking.total_price != null
-                            ? `${Number(booking.total_price).toFixed(2)} €`
-                            : '—'}
-                        </td>
-                      </tr>
-                    ))}
+                    {bookingsData.map((booking) => {
+                      const room = booking.room as Record<string, string> | null;
+                      const guest = booking.guest as Record<string, string> | null;
+
+                      return (
+                        <tr
+                          key={String(booking.id)}
+                          className="border-b hover:bg-muted/30"
+                        >
+                          <td className="p-3">
+                            <Link
+                              href={`/home/${account}/bookings/${String(booking.id)}`}
+                              className="font-medium hover:underline"
+                            >
+                              {room
+                                ? `${room.room_number}${room.name ? ` – ${room.name}` : ''}`
+                                : '—'}
+                            </Link>
+                          </td>
+                          <td className="p-3">
+                            {guest
+                              ? `${guest.first_name} ${guest.last_name}`
+                              : '—'}
+                          </td>
+                          <td className="p-3">
+                            {booking.check_in
+                              ? new Date(
+                                  String(booking.check_in),
+                                ).toLocaleDateString('de-DE')
+                              : '—'}
+                          </td>
+                          <td className="p-3">
+                            {booking.check_out
+                              ? new Date(
+                                  String(booking.check_out),
+                                ).toLocaleDateString('de-DE')
+                              : '—'}
+                          </td>
+                          <td className="p-3">
+                            <Badge
+                              variant={
+                                STATUS_BADGE_VARIANT[String(booking.status)] ??
+                                'secondary'
+                              }
+                            >
+                              {STATUS_LABEL[String(booking.status)] ??
+                                String(booking.status)}
+                            </Badge>
+                          </td>
+                          <td className="p-3 text-right">
+                            {booking.total_price != null
+                              ? `${Number(booking.total_price).toFixed(2)} €`
+                              : '—'}
+                          </td>
+                        </tr>
+                      );
+                    })}
                   </tbody>
                 </table>
               </div>
+
+              {/* Pagination */}
+              {totalPages > 1 && !searchQuery && (
+                <div className="flex items-center justify-between border-t px-2 py-4">
+                  <p className="text-sm text-muted-foreground">
+                    Seite {page} von {totalPages} ({total} Einträge)
+                  </p>
+                  <div className="flex items-center gap-2">
+                    {page > 1 ? (
+                      <Link
+                        href={`/home/${account}/bookings?page=${page - 1}`}
+                      >
+                        <Button variant="outline" size="sm">
+                          Zurück
+                        </Button>
+                      </Link>
+                    ) : (
+                      <Button variant="outline" size="sm" disabled>
+                        Zurück
+                      </Button>
+                    )}
+
+                    {page < totalPages ? (
+                      <Link
+                        href={`/home/${account}/bookings?page=${page + 1}`}
+                      >
+                        <Button variant="outline" size="sm">
+                          Weiter
+                        </Button>
+                      </Link>
+                    ) : (
+                      <Button variant="outline" size="sm" disabled>
+                        Weiter
+                      </Button>
+                    )}
+                  </div>
+                </div>
+              )}
             </CardContent>
           </Card>
         )}
diff --git a/apps/web/app/[locale]/home/[account]/bookings/rooms/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/rooms/page.tsx
index bd058cb7e..ab05ccb88 100644
--- a/apps/web/app/[locale]/home/[account]/bookings/rooms/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/bookings/rooms/page.tsx
@@ -9,6 +9,7 @@ import { createBookingManagementApi } from '@kit/booking-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -24,7 +25,13 @@ export default async function RoomsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) {
+    return (
+      <CmsPageShell account={account} title="Zimmer">
+        <AccountNotFound />
+      </CmsPageShell>
+    );
+  }
 
   const api = createBookingManagementApi(client);
   const rooms = await api.listRooms(acct.id);
@@ -33,10 +40,7 @@ export default async function RoomsPage({ params }: PageProps) {
     <CmsPageShell account={account} title="Zimmer">
       <div className="flex w-full flex-col gap-6">
         <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-2xl font-bold">Zimmer</h1>
-            <p className="text-muted-foreground">Zimmerverwaltung</p>
-          </div>
+          <p className="text-muted-foreground">Zimmerverwaltung</p>
           <Button>
             <Plus className="mr-2 h-4 w-4" />
             Neues Zimmer
diff --git a/apps/web/app/[locale]/home/[account]/courses/calendar/page.tsx b/apps/web/app/[locale]/home/[account]/courses/calendar/page.tsx
index 705c91af8..9be29c505 100644
--- a/apps/web/app/[locale]/home/[account]/courses/calendar/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/courses/calendar/page.tsx
@@ -10,6 +10,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
 import { createCourseManagementApi } from '@kit/course-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -51,7 +52,7 @@ export default async function CourseCalendarPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createCourseManagementApi(client);
   const courses = await api.listCourses(acct.id, { page: 1, pageSize: 100 });
@@ -119,12 +120,9 @@ export default async function CourseCalendarPage({ params }: PageProps) {
                 <ArrowLeft className="h-4 w-4" />
               </Button>
             </Link>
-            <div>
-              <h1 className="text-2xl font-bold">Kurskalender</h1>
-              <p className="text-muted-foreground">
-                Kurstermine im Überblick
-              </p>
-            </div>
+            <p className="text-muted-foreground">
+              Kurstermine im Überblick
+            </p>
           </div>
         </div>
 
diff --git a/apps/web/app/[locale]/home/[account]/courses/categories/page.tsx b/apps/web/app/[locale]/home/[account]/courses/categories/page.tsx
index e376f4fce..3a0b7f08d 100644
--- a/apps/web/app/[locale]/home/[account]/courses/categories/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/courses/categories/page.tsx
@@ -8,6 +8,7 @@ import { createCourseManagementApi } from '@kit/course-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -23,7 +24,7 @@ export default async function CategoriesPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createCourseManagementApi(client);
   const categories = await api.listCategories(acct.id);
@@ -32,10 +33,7 @@ export default async function CategoriesPage({ params }: PageProps) {
     <CmsPageShell account={account} title="Kategorien">
       <div className="flex w-full flex-col gap-6">
         <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-2xl font-bold">Kategorien</h1>
-            <p className="text-muted-foreground">Kurskategorien verwalten</p>
-          </div>
+          <p className="text-muted-foreground">Kurskategorien verwalten</p>
           <Button>
             <Plus className="mr-2 h-4 w-4" />
             Neue Kategorie
diff --git a/apps/web/app/[locale]/home/[account]/courses/instructors/page.tsx b/apps/web/app/[locale]/home/[account]/courses/instructors/page.tsx
index 7254745e7..ed1187999 100644
--- a/apps/web/app/[locale]/home/[account]/courses/instructors/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/courses/instructors/page.tsx
@@ -8,6 +8,7 @@ import { createCourseManagementApi } from '@kit/course-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -23,7 +24,7 @@ export default async function InstructorsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createCourseManagementApi(client);
   const instructors = await api.listInstructors(acct.id);
@@ -32,10 +33,7 @@ export default async function InstructorsPage({ params }: PageProps) {
     <CmsPageShell account={account} title="Dozenten">
       <div className="flex w-full flex-col gap-6">
         <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-2xl font-bold">Dozenten</h1>
-            <p className="text-muted-foreground">Dozentenpool verwalten</p>
-          </div>
+          <p className="text-muted-foreground">Dozentenpool verwalten</p>
           <Button>
             <Plus className="mr-2 h-4 w-4" />
             Neuer Dozent
diff --git a/apps/web/app/[locale]/home/[account]/courses/locations/page.tsx b/apps/web/app/[locale]/home/[account]/courses/locations/page.tsx
index 4c0cd69b7..f02c163b1 100644
--- a/apps/web/app/[locale]/home/[account]/courses/locations/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/courses/locations/page.tsx
@@ -8,6 +8,7 @@ import { createCourseManagementApi } from '@kit/course-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -23,7 +24,7 @@ export default async function LocationsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createCourseManagementApi(client);
   const locations = await api.listLocations(acct.id);
@@ -32,10 +33,7 @@ export default async function LocationsPage({ params }: PageProps) {
     <CmsPageShell account={account} title="Orte">
       <div className="flex w-full flex-col gap-6">
         <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-2xl font-bold">Orte</h1>
-            <p className="text-muted-foreground">Kurs- und Veranstaltungsorte verwalten</p>
-          </div>
+          <p className="text-muted-foreground">Kurs- und Veranstaltungsorte verwalten</p>
           <Button>
             <Plus className="mr-2 h-4 w-4" />
             Neuer Ort
diff --git a/apps/web/app/[locale]/home/[account]/courses/new/page.tsx b/apps/web/app/[locale]/home/[account]/courses/new/page.tsx
index fea0cc3dc..2285c7550 100644
--- a/apps/web/app/[locale]/home/[account]/courses/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/courses/new/page.tsx
@@ -1,6 +1,7 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { CreateCourseForm } from '@kit/course-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -8,7 +9,7 @@ export default async function NewCoursePage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
     <CmsPageShell account={account} title="Neuer Kurs" description="Kurs anlegen">
diff --git a/apps/web/app/[locale]/home/[account]/courses/page.tsx b/apps/web/app/[locale]/home/[account]/courses/page.tsx
index c5c40d836..c1fc46744 100644
--- a/apps/web/app/[locale]/home/[account]/courses/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/courses/page.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-import { GraduationCap, Plus, Users, Calendar, Euro } from 'lucide-react';
+import { ChevronLeft, ChevronRight, GraduationCap, Plus, Users, Calendar, Euro } from 'lucide-react';
 
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Badge } from '@kit/ui/badge';
@@ -12,32 +12,19 @@ import { createCourseManagementApi } from '@kit/course-management/api';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
+import { COURSE_STATUS_VARIANT, COURSE_STATUS_LABEL } from '~/lib/status-badges';
 
 interface PageProps {
   params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
 }
 
-const STATUS_BADGE_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  planned: 'secondary',
-  open: 'default',
-  running: 'info',
-  completed: 'outline',
-  cancelled: 'destructive',
-};
+const PAGE_SIZE = 25;
 
-const STATUS_LABEL: Record<string, string> = {
-  planned: 'Geplant',
-  open: 'Offen',
-  running: 'Laufend',
-  completed: 'Abgeschlossen',
-  cancelled: 'Abgesagt',
-};
-
-export default async function CoursesPage({ params }: PageProps) {
+export default async function CoursesPage({ params, searchParams }: PageProps) {
   const { account } = await params;
+  const search = await searchParams;
   const client = getSupabaseServerClient();
 
   const { data: acct } = await client
@@ -46,26 +33,26 @@ export default async function CoursesPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createCourseManagementApi(client);
+  const page = Number(search.page) || 1;
 
   const [courses, stats] = await Promise.all([
-    api.listCourses(acct.id, { page: 1 }),
+    api.listCourses(acct.id, { page, pageSize: PAGE_SIZE }),
     api.getStatistics(acct.id),
   ]);
 
+  const totalPages = Math.ceil(courses.total / PAGE_SIZE);
+
   return (
     <CmsPageShell account={account} title="Kurse">
       <div className="flex w-full flex-col gap-6">
         {/* Header */}
         <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-2xl font-bold">Kurse</h1>
-            <p className="text-muted-foreground">
-              Kursangebot verwalten
-            </p>
-          </div>
+          <p className="text-muted-foreground">
+            Kursangebot verwalten
+          </p>
 
           <Link href={`/home/${account}/courses/new`}>
             <Button>
@@ -123,7 +110,7 @@ export default async function CoursesPage({ params }: PageProps) {
                       <th className="p-3 text-left font-medium">Beginn</th>
                       <th className="p-3 text-left font-medium">Ende</th>
                       <th className="p-3 text-left font-medium">Status</th>
-                      <th className="p-3 text-right font-medium">Teilnehmer</th>
+                      <th className="p-3 text-right font-medium">Kapazität</th>
                       <th className="p-3 text-right font-medium">Gebühr</th>
                     </tr>
                   </thead>
@@ -153,13 +140,15 @@ export default async function CoursesPage({ params }: PageProps) {
                         </td>
                         <td className="p-3">
                           <Badge
-                            variant={STATUS_BADGE_VARIANT[String(course.status)] ?? 'secondary'}
+                            variant={COURSE_STATUS_VARIANT[String(course.status)] ?? 'secondary'}
                           >
-                            {STATUS_LABEL[String(course.status)] ?? String(course.status)}
+                            {COURSE_STATUS_LABEL[String(course.status)] ?? String(course.status)}
                           </Badge>
                         </td>
                         <td className="p-3 text-right">
-                          {String(course.capacity ?? '—')}
+                          {course.capacity != null
+                            ? String(course.capacity)
+                            : '—'}
                         </td>
                         <td className="p-3 text-right">
                           {course.fee != null
@@ -171,6 +160,44 @@ export default async function CoursesPage({ params }: PageProps) {
                   </tbody>
                 </table>
               </div>
+
+              {/* Pagination */}
+              {totalPages > 1 && (
+                <div className="flex items-center justify-between border-t px-2 py-4">
+                  <p className="text-sm text-muted-foreground">
+                    Seite {page} von {totalPages} ({courses.total} Einträge)
+                  </p>
+                  <div className="flex items-center gap-2">
+                    {page > 1 ? (
+                      <Link href={`/home/${account}/courses?page=${page - 1}`}>
+                        <Button variant="outline" size="sm">
+                          <ChevronLeft className="mr-1 h-4 w-4" />
+                          Zurück
+                        </Button>
+                      </Link>
+                    ) : (
+                      <Button variant="outline" size="sm" disabled>
+                        <ChevronLeft className="mr-1 h-4 w-4" />
+                        Zurück
+                      </Button>
+                    )}
+
+                    {page < totalPages ? (
+                      <Link href={`/home/${account}/courses?page=${page + 1}`}>
+                        <Button variant="outline" size="sm">
+                          Weiter
+                          <ChevronRight className="ml-1 h-4 w-4" />
+                        </Button>
+                      </Link>
+                    ) : (
+                      <Button variant="outline" size="sm" disabled>
+                        Weiter
+                        <ChevronRight className="ml-1 h-4 w-4" />
+                      </Button>
+                    )}
+                  </div>
+                </div>
+              )}
             </CardContent>
           </Card>
         )}
diff --git a/apps/web/app/[locale]/home/[account]/courses/statistics/page.tsx b/apps/web/app/[locale]/home/[account]/courses/statistics/page.tsx
index 2ebe734b8..acb2d8007 100644
--- a/apps/web/app/[locale]/home/[account]/courses/statistics/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/courses/statistics/page.tsx
@@ -8,6 +8,7 @@ import { createCourseManagementApi } from '@kit/course-management/api';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { StatsCard } from '~/components/stats-card';
 import { StatsBarChart, StatsPieChart } from '~/components/stats-charts';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -18,7 +19,7 @@ export default async function CourseStatisticsPage({ params }: PageProps) {
   const client = getSupabaseServerClient();
 
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createCourseManagementApi(client);
   const stats = await api.getStatistics(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/documents/_components/generate-document-form.tsx b/apps/web/app/[locale]/home/[account]/documents/_components/generate-document-form.tsx
new file mode 100644
index 000000000..79be8df3b
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/documents/_components/generate-document-form.tsx
@@ -0,0 +1,242 @@
+'use client';
+
+import { useState, useTransition } from 'react';
+
+import { FileDown, Loader2, AlertCircle, CheckCircle2 } from 'lucide-react';
+
+import { Button } from '@kit/ui/button';
+import { Input } from '@kit/ui/input';
+import { Label } from '@kit/ui/label';
+
+import {
+  generateDocumentAction,
+  type GenerateDocumentInput,
+  type GenerateDocumentResult,
+} from '../_lib/server/generate-document';
+
+interface Props {
+  accountSlug: string;
+  initialType: string;
+}
+
+const DOCUMENT_LABELS: Record<string, string> = {
+  'member-card': 'Mitgliedsausweis',
+  invoice: 'Rechnung',
+  labels: 'Etiketten',
+  report: 'Bericht',
+  letter: 'Brief',
+  certificate: 'Zertifikat',
+};
+
+const COMING_SOON_TYPES = new Set(['invoice', 'letter', 'certificate']);
+
+export function GenerateDocumentForm({ accountSlug, initialType }: Props) {
+  const [isPending, startTransition] = useTransition();
+  const [result, setResult] = useState<GenerateDocumentResult | null>(null);
+  const [selectedType, setSelectedType] = useState(initialType);
+
+  const isComingSoon = COMING_SOON_TYPES.has(selectedType);
+
+  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault();
+    setResult(null);
+
+    const formData = new FormData(e.currentTarget);
+    const input: GenerateDocumentInput = {
+      accountSlug,
+      documentType: formData.get('documentType') as string,
+      title: formData.get('title') as string,
+      format: formData.get('format') as 'A4' | 'A5' | 'letter',
+      orientation: formData.get('orientation') as 'portrait' | 'landscape',
+    };
+
+    startTransition(async () => {
+      const res = await generateDocumentAction(input);
+      setResult(res);
+
+      if (res.success && res.data && res.mimeType && res.fileName) {
+        downloadFile(res.data, res.mimeType, res.fileName);
+      }
+    });
+  }
+
+  return (
+    <form className="flex flex-col gap-5" onSubmit={handleSubmit}>
+      {/* Document Type */}
+      <div className="flex flex-col gap-2">
+        <Label htmlFor="documentType">Dokumenttyp</Label>
+        <select
+          id="documentType"
+          name="documentType"
+          value={selectedType}
+          onChange={(e) => {
+            setSelectedType(e.target.value);
+            setResult(null);
+          }}
+          className="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2"
+        >
+          <option value="member-card">Mitgliedsausweis</option>
+          <option value="invoice">Rechnung</option>
+          <option value="labels">Etiketten</option>
+          <option value="report">Bericht</option>
+          <option value="letter">Brief</option>
+          <option value="certificate">Zertifikat</option>
+        </select>
+      </div>
+
+      {/* Coming soon banner */}
+      {isComingSoon && (
+        <div className="flex items-start gap-3 rounded-md border border-amber-200 bg-amber-50 p-4 text-sm text-amber-800 dark:border-amber-800 dark:bg-amber-950/40 dark:text-amber-200">
+          <AlertCircle className="mt-0.5 h-4 w-4 shrink-0" />
+          <div>
+            <p className="font-medium">Demnächst verfügbar</p>
+            <p className="mt-1 text-amber-700 dark:text-amber-300">
+              Die Generierung von &ldquo;{DOCUMENT_LABELS[selectedType]}&rdquo;
+              befindet sich noch in Entwicklung und wird in Kürze verfügbar sein.
+            </p>
+          </div>
+        </div>
+      )}
+
+      {/* Title */}
+      <div className="flex flex-col gap-2">
+        <Label htmlFor="title">Titel / Bezeichnung</Label>
+        <Input
+          id="title"
+          name="title"
+          placeholder={`z.B. ${DOCUMENT_LABELS[selectedType] ?? 'Dokument'} ${new Date().getFullYear()}`}
+          required
+          disabled={isPending}
+        />
+      </div>
+
+      {/* Format & Orientation */}
+      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+        <div className="flex flex-col gap-2">
+          <Label htmlFor="format">Format</Label>
+          <select
+            id="format"
+            name="format"
+            disabled={isPending}
+            className="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:opacity-50"
+          >
+            <option value="A4">A4</option>
+            <option value="A5">A5</option>
+            <option value="letter">Letter</option>
+          </select>
+        </div>
+        <div className="flex flex-col gap-2">
+          <Label htmlFor="orientation">Ausrichtung</Label>
+          <select
+            id="orientation"
+            name="orientation"
+            disabled={isPending}
+            className="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:opacity-50"
+          >
+            <option value="portrait">Hochformat</option>
+            <option value="landscape">Querformat</option>
+          </select>
+        </div>
+      </div>
+
+      {/* Hint */}
+      <div className="text-muted-foreground rounded-md bg-muted/50 p-4 text-sm">
+        <p>
+          <strong>Hinweis:</strong>{' '}
+          {selectedType === 'member-card'
+            ? 'Es werden Mitgliedsausweise für alle aktiven Mitglieder generiert (4 Karten pro A4-Seite).'
+            : selectedType === 'labels'
+              ? 'Es werden Adressetiketten im Avery-L7163-Format für alle aktiven Mitglieder erzeugt.'
+              : selectedType === 'report'
+                ? 'Es wird eine Excel-Datei mit allen Mitgliederdaten erstellt.'
+                : 'Wählen Sie den gewünschten Dokumenttyp, um die Generierung zu starten.'}
+        </p>
+      </div>
+
+      {/* Result feedback */}
+      {result && !result.success && (
+        <div className="flex items-start gap-3 rounded-md border border-red-200 bg-red-50 p-4 text-sm text-red-800 dark:border-red-800 dark:bg-red-950/40 dark:text-red-200">
+          <AlertCircle className="mt-0.5 h-4 w-4 shrink-0" />
+          <div>
+            <p className="font-medium">Fehler bei der Generierung</p>
+            <p className="mt-1">{result.error}</p>
+          </div>
+        </div>
+      )}
+
+      {result && result.success && (
+        <div className="flex items-start gap-3 rounded-md border border-green-200 bg-green-50 p-4 text-sm text-green-800 dark:border-green-800 dark:bg-green-950/40 dark:text-green-200">
+          <CheckCircle2 className="mt-0.5 h-4 w-4 shrink-0" />
+          <div>
+            <p className="font-medium">Dokument erfolgreich erstellt!</p>
+            <p className="mt-1">
+              Die Datei &ldquo;{result.fileName}&rdquo; wurde heruntergeladen.
+            </p>
+            {result.data && result.mimeType && result.fileName && (
+              <button
+                type="button"
+                className="mt-2 text-green-700 underline hover:text-green-900 dark:text-green-300 dark:hover:text-green-100"
+                onClick={() =>
+                  downloadFile(result.data!, result.mimeType!, result.fileName!)
+                }
+              >
+                Erneut herunterladen
+              </button>
+            )}
+          </div>
+        </div>
+      )}
+
+      {/* Submit button */}
+      <div className="flex justify-end">
+        <Button type="submit" disabled={isPending || isComingSoon}>
+          {isPending ? (
+            <>
+              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+              Wird generiert…
+            </>
+          ) : (
+            <>
+              <FileDown className="mr-2 h-4 w-4" />
+              Generieren
+            </>
+          )}
+        </Button>
+      </div>
+    </form>
+  );
+}
+
+/**
+ * Trigger a browser download from a base64 string.
+ * Uses an anchor element with the download attribute set to the full filename.
+ */
+function downloadFile(
+  base64Data: string,
+  mimeType: string,
+  fileName: string,
+) {
+  const byteCharacters = atob(base64Data);
+  const byteNumbers = new Array(byteCharacters.length);
+  for (let i = 0; i < byteCharacters.length; i++) {
+    byteNumbers[i] = byteCharacters.charCodeAt(i);
+  }
+  const byteArray = new Uint8Array(byteNumbers);
+  const blob = new Blob([byteArray], { type: mimeType });
+
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement('a');
+  a.style.display = 'none';
+  a.href = url;
+  // Ensure the filename always has the right extension
+  a.download = fileName;
+  // Force the filename by also setting it via the Content-Disposition-like attribute
+  a.setAttribute('download', fileName);
+  document.body.appendChild(a);
+  a.click();
+  // Small delay before cleanup to ensure download starts
+  setTimeout(() => {
+    document.body.removeChild(a);
+    URL.revokeObjectURL(url);
+  }, 100);
+}
diff --git a/apps/web/app/[locale]/home/[account]/documents/_lib/server/generate-document.ts b/apps/web/app/[locale]/home/[account]/documents/_lib/server/generate-document.ts
new file mode 100644
index 000000000..094bffb75
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/documents/_lib/server/generate-document.ts
@@ -0,0 +1,385 @@
+'use server';
+
+import React from 'react';
+
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createDocumentGeneratorApi } from '@kit/document-generator/api';
+
+export type GenerateDocumentInput = {
+  accountSlug: string;
+  documentType: string;
+  title: string;
+  format: 'A4' | 'A5' | 'letter';
+  orientation: 'portrait' | 'landscape';
+};
+
+export type GenerateDocumentResult = {
+  success: boolean;
+  data?: string;
+  mimeType?: string;
+  fileName?: string;
+  error?: string;
+};
+
+export async function generateDocumentAction(
+  input: GenerateDocumentInput,
+): Promise<GenerateDocumentResult> {
+  try {
+    const client = getSupabaseServerClient();
+
+    const { data: acct, error: acctError } = await client
+      .from('accounts')
+      .select('id, name')
+      .eq('slug', input.accountSlug)
+      .single();
+
+    if (acctError || !acct) {
+      return { success: false, error: 'Konto nicht gefunden.' };
+    }
+
+    switch (input.documentType) {
+      case 'member-card':
+        return await generateMemberCards(client, acct.id, acct.name, input);
+      case 'labels':
+        return await generateLabels(client, acct.id, input);
+      case 'report':
+        return await generateMemberReport(client, acct.id, input);
+      case 'invoice':
+      case 'letter':
+      case 'certificate':
+        return {
+          success: false,
+          error: `"${LABELS[input.documentType] ?? input.documentType}" ist noch in Entwicklung.`,
+        };
+      default:
+        return { success: false, error: 'Unbekannter Dokumenttyp.' };
+    }
+  } catch (err) {
+    console.error('Document generation error:', err);
+    return {
+      success: false,
+      error: err instanceof Error ? err.message : 'Unbekannter Fehler.',
+    };
+  }
+}
+
+const LABELS: Record<string, string> = {
+  'member-card': 'Mitgliedsausweis',
+  invoice: 'Rechnung',
+  labels: 'Etiketten',
+  report: 'Bericht',
+  letter: 'Brief',
+  certificate: 'Zertifikat',
+};
+
+function fmtDate(d: string | null): string {
+  if (!d) return '–';
+  try { return new Date(d).toLocaleDateString('de-DE'); } catch { return d; }
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Member Card PDF — premium design with color accent bar, structured layout
+// ═══════════════════════════════════════════════════════════════════════════
+async function generateMemberCards(
+  client: ReturnType<typeof getSupabaseServerClient>,
+  accountId: string,
+  accountName: string,
+  input: GenerateDocumentInput,
+): Promise<GenerateDocumentResult> {
+  const { data: members, error } = await client
+    .from('members')
+    .select('id, member_number, first_name, last_name, entry_date, status, date_of_birth, street, house_number, postal_code, city, email')
+    .eq('account_id', accountId)
+    .eq('status', 'active')
+    .order('last_name');
+
+  if (error) return { success: false, error: `DB-Fehler: ${error.message}` };
+  if (!members?.length) return { success: false, error: 'Keine aktiven Mitglieder.' };
+
+  const { Document, Page, View, Text, StyleSheet, renderToBuffer, Svg, Rect, Circle } =
+    await import('@react-pdf/renderer');
+
+  // — Brand colors (configurable later via account settings) —
+  const PRIMARY = '#1e40af';
+  const PRIMARY_LIGHT = '#dbeafe';
+  const DARK = '#0f172a';
+  const GRAY = '#64748b';
+  const LIGHT_GRAY = '#f1f5f9';
+
+  const s = StyleSheet.create({
+    page: { padding: 24, flexDirection: 'row', flexWrap: 'wrap', gap: 16, fontFamily: 'Helvetica' },
+
+    // ── Card shell ──
+    card: {
+      width: '47%',
+      height: '45%',
+      borderRadius: 10,
+      overflow: 'hidden',
+      border: `1pt solid ${PRIMARY_LIGHT}`,
+      backgroundColor: '#ffffff',
+    },
+
+    // ── Top accent bar ──
+    accentBar: { height: 6, backgroundColor: PRIMARY },
+
+    // ── Header area ──
+    header: {
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+      paddingHorizontal: 14,
+      paddingTop: 10,
+      paddingBottom: 4,
+    },
+    clubName: { fontSize: 12, fontFamily: 'Helvetica-Bold', color: PRIMARY },
+    badge: {
+      backgroundColor: PRIMARY_LIGHT,
+      borderRadius: 4,
+      paddingHorizontal: 6,
+      paddingVertical: 2,
+    },
+    badgeText: { fontSize: 6, color: PRIMARY, fontFamily: 'Helvetica-Bold', textTransform: 'uppercase' as const, letterSpacing: 0.8 },
+
+    // ── Main content ──
+    body: { flexDirection: 'row', paddingHorizontal: 14, paddingTop: 8, gap: 12, flex: 1 },
+
+    // Photo column
+    photoCol: { width: 64, alignItems: 'center' },
+    photoFrame: {
+      width: 56,
+      height: 68,
+      borderRadius: 6,
+      backgroundColor: LIGHT_GRAY,
+      border: `0.5pt solid #e2e8f0`,
+      justifyContent: 'center',
+      alignItems: 'center',
+    },
+    photoIcon: { fontSize: 20, color: '#cbd5e1' },
+    memberNumber: {
+      marginTop: 4,
+      fontSize: 7,
+      color: PRIMARY,
+      fontFamily: 'Helvetica-Bold',
+      textAlign: 'center' as const,
+    },
+
+    // Info column
+    infoCol: { flex: 1, justifyContent: 'center' },
+    memberName: { fontSize: 14, fontFamily: 'Helvetica-Bold', color: DARK, marginBottom: 6 },
+
+    fieldGroup: { flexDirection: 'row', flexWrap: 'wrap', gap: 4 },
+    field: { width: '48%', marginBottom: 5 },
+    fieldLabel: { fontSize: 6, color: GRAY, textTransform: 'uppercase' as const, letterSpacing: 0.6, marginBottom: 1 },
+    fieldValue: { fontSize: 8, color: DARK, fontFamily: 'Helvetica-Bold' },
+
+    // ── Footer ──
+    footer: {
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+      paddingHorizontal: 14,
+      paddingVertical: 6,
+      backgroundColor: LIGHT_GRAY,
+      borderTop: `0.5pt solid #e2e8f0`,
+    },
+    footerLeft: { fontSize: 6, color: GRAY },
+    footerRight: { fontSize: 6, color: GRAY },
+    validDot: { width: 5, height: 5, borderRadius: 2.5, backgroundColor: '#22c55e', marginRight: 3 },
+  });
+
+  const today = new Date().toLocaleDateString('de-DE');
+  const year = new Date().getFullYear();
+  const cardsPerPage = 4;
+  const pages: React.ReactElement[] = [];
+
+  for (let i = 0; i < members.length; i += cardsPerPage) {
+    const batch = members.slice(i, i + cardsPerPage);
+
+    pages.push(
+      React.createElement(
+        Page,
+        { key: `p${i}`, size: input.format === 'letter' ? 'LETTER' : (input.format.toUpperCase() as 'A4'|'A5'), orientation: input.orientation, style: s.page },
+        ...batch.map((m) =>
+          React.createElement(View, { key: m.id, style: s.card },
+            // Accent bar
+            React.createElement(View, { style: s.accentBar }),
+
+            // Header
+            React.createElement(View, { style: s.header },
+              React.createElement(Text, { style: s.clubName }, accountName),
+              React.createElement(View, { style: s.badge },
+                React.createElement(Text, { style: s.badgeText }, 'Mitgliedsausweis'),
+              ),
+            ),
+
+            // Body: photo + info
+            React.createElement(View, { style: s.body },
+              // Photo column
+              React.createElement(View, { style: s.photoCol },
+                React.createElement(View, { style: s.photoFrame },
+                  React.createElement(Text, { style: s.photoIcon }, '👤'),
+                ),
+                React.createElement(Text, { style: s.memberNumber }, `Nr. ${m.member_number ?? '–'}`),
+              ),
+
+              // Info column
+              React.createElement(View, { style: s.infoCol },
+                React.createElement(Text, { style: s.memberName }, `${m.first_name} ${m.last_name}`),
+                React.createElement(View, { style: s.fieldGroup },
+                  // Entry date
+                  React.createElement(View, { style: s.field },
+                    React.createElement(Text, { style: s.fieldLabel }, 'Mitglied seit'),
+                    React.createElement(Text, { style: s.fieldValue }, fmtDate(m.entry_date)),
+                  ),
+                  // Date of birth
+                  React.createElement(View, { style: s.field },
+                    React.createElement(Text, { style: s.fieldLabel }, 'Geb.-Datum'),
+                    React.createElement(Text, { style: s.fieldValue }, fmtDate(m.date_of_birth)),
+                  ),
+                  // Address
+                  React.createElement(View, { style: { ...s.field, width: '100%' } },
+                    React.createElement(Text, { style: s.fieldLabel }, 'Adresse'),
+                    React.createElement(Text, { style: s.fieldValue },
+                      [m.street, m.house_number].filter(Boolean).join(' ') || '–',
+                    ),
+                    React.createElement(Text, { style: { ...s.fieldValue, marginTop: 1 } },
+                      [m.postal_code, m.city].filter(Boolean).join(' ') || '',
+                    ),
+                  ),
+                ),
+              ),
+            ),
+
+            // Footer
+            React.createElement(View, { style: s.footer },
+              React.createElement(View, { style: { flexDirection: 'row', alignItems: 'center' } },
+                React.createElement(View, { style: s.validDot }),
+                React.createElement(Text, { style: s.footerLeft }, `Gültig ${year}/${year + 1}`),
+              ),
+              React.createElement(Text, { style: s.footerRight }, `Ausgestellt ${today}`),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  const doc = React.createElement(Document, { title: input.title }, ...pages);
+  const buffer = await renderToBuffer(doc);
+
+  return {
+    success: true,
+    data: Buffer.from(buffer).toString('base64'),
+    mimeType: 'application/pdf',
+    fileName: `${input.title || 'Mitgliedsausweise'}.pdf`,
+  };
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Address Labels (HTML — Avery L7163)
+// ═══════════════════════════════════════════════════════════════════════════
+async function generateLabels(
+  client: ReturnType<typeof getSupabaseServerClient>,
+  accountId: string,
+  input: GenerateDocumentInput,
+): Promise<GenerateDocumentResult> {
+  const { data: members, error } = await client
+    .from('members')
+    .select('first_name, last_name, street, house_number, postal_code, city, salutation, title')
+    .eq('account_id', accountId)
+    .eq('status', 'active')
+    .order('last_name');
+
+  if (error) return { success: false, error: `DB-Fehler: ${error.message}` };
+  if (!members?.length) return { success: false, error: 'Keine aktiven Mitglieder.' };
+
+  const api = createDocumentGeneratorApi();
+  const records = members.map((m) => ({
+    line1: [m.salutation, m.title, m.first_name, m.last_name].filter(Boolean).join(' '),
+    line2: [m.street, m.house_number].filter(Boolean).join(' ') || undefined,
+    line3: [m.postal_code, m.city].filter(Boolean).join(' ') || undefined,
+  }));
+
+  const html = api.generateLabelsHtml({ labelFormat: 'avery-l7163', records });
+
+  return {
+    success: true,
+    data: Buffer.from(html, 'utf-8').toString('base64'),
+    mimeType: 'text/html',
+    fileName: `${input.title || 'Adressetiketten'}.html`,
+  };
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+// Member Report (Excel)
+// ═══════════════════════════════════════════════════════════════════════════
+async function generateMemberReport(
+  client: ReturnType<typeof getSupabaseServerClient>,
+  accountId: string,
+  input: GenerateDocumentInput,
+): Promise<GenerateDocumentResult> {
+  const { data: members, error } = await client
+    .from('members')
+    .select('member_number, last_name, first_name, email, postal_code, city, status, entry_date')
+    .eq('account_id', accountId)
+    .order('last_name');
+
+  if (error) return { success: false, error: `DB-Fehler: ${error.message}` };
+  if (!members?.length) return { success: false, error: 'Keine Mitglieder.' };
+
+  const ExcelJS = await import('exceljs');
+  const wb = new ExcelJS.Workbook();
+  wb.creator = 'MyEasyCMS';
+  wb.created = new Date();
+
+  const ws = wb.addWorksheet('Mitglieder');
+  ws.columns = [
+    { header: 'Nr.', key: 'nr', width: 12 },
+    { header: 'Name', key: 'name', width: 20 },
+    { header: 'Vorname', key: 'vorname', width: 20 },
+    { header: 'E-Mail', key: 'email', width: 28 },
+    { header: 'PLZ', key: 'plz', width: 10 },
+    { header: 'Ort', key: 'ort', width: 20 },
+    { header: 'Status', key: 'status', width: 12 },
+    { header: 'Eintritt', key: 'eintritt', width: 14 },
+  ];
+
+  const hdr = ws.getRow(1);
+  hdr.font = { bold: true, color: { argb: 'FFFFFFFF' } };
+  hdr.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF1E40AF' } };
+  hdr.alignment = { vertical: 'middle', horizontal: 'center' };
+  hdr.height = 24;
+
+  const SL: Record<string, string> = { active: 'Aktiv', inactive: 'Inaktiv', pending: 'Ausstehend', resigned: 'Ausgetreten', excluded: 'Ausgeschlossen' };
+
+  for (const m of members) {
+    ws.addRow({
+      nr: m.member_number ?? '',
+      name: m.last_name,
+      vorname: m.first_name,
+      email: m.email ?? '',
+      plz: m.postal_code ?? '',
+      ort: m.city ?? '',
+      status: SL[m.status] ?? m.status,
+      eintritt: m.entry_date ? new Date(m.entry_date).toLocaleDateString('de-DE') : '',
+    });
+  }
+
+  ws.eachRow((row, n) => {
+    if (n > 1 && n % 2 === 0) row.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFF1F5F9' } };
+    row.border = { bottom: { style: 'thin', color: { argb: 'FFE2E8F0' } } };
+  });
+
+  ws.addRow({});
+  const sum = ws.addRow({ nr: `Gesamt: ${members.length} Mitglieder` });
+  sum.font = { bold: true };
+
+  const buf = await wb.xlsx.writeBuffer();
+
+  return {
+    success: true,
+    data: Buffer.from(buf as ArrayBuffer).toString('base64'),
+    mimeType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    fileName: `${input.title || 'Mitgliederbericht'}.xlsx`,
+  };
+}
diff --git a/apps/web/app/[locale]/home/[account]/documents/generate/page.tsx b/apps/web/app/[locale]/home/[account]/documents/generate/page.tsx
index 5c22a2eb1..5452d592d 100644
--- a/apps/web/app/[locale]/home/[account]/documents/generate/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/documents/generate/page.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-import { ArrowLeft, FileDown } from 'lucide-react';
+import { ArrowLeft } from 'lucide-react';
 
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Button } from '@kit/ui/button';
@@ -12,11 +12,12 @@ import {
   CardHeader,
   CardTitle,
 } from '@kit/ui/card';
-import { Input } from '@kit/ui/input';
-import { Label } from '@kit/ui/label';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 
+import { GenerateDocumentForm } from '../_components/generate-document-form';
+import { AccountNotFound } from '~/components/account-not-found';
+
 interface PageProps {
   params: Promise<{ account: string }>;
   searchParams: Promise<{ type?: string }>;
@@ -45,7 +46,7 @@ export default async function GenerateDocumentPage({
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const selectedType = type ?? 'member-card';
   const selectedLabel = DOCUMENT_LABELS[selectedType] ?? 'Dokument';
@@ -73,82 +74,16 @@ export default async function GenerateDocumentPage({
           </CardHeader>
 
           <CardContent>
-            <form className="flex flex-col gap-5">
-              {/* Document Type */}
-              <div className="flex flex-col gap-2">
-                <Label htmlFor="documentType">Dokumenttyp</Label>
-                <select
-                  id="documentType"
-                  name="documentType"
-                  defaultValue={selectedType}
-                  className="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2"
-                >
-                  <option value="member-card">Mitgliedsausweis</option>
-                  <option value="invoice">Rechnung</option>
-                  <option value="labels">Etiketten</option>
-                  <option value="report">Bericht</option>
-                  <option value="letter">Brief</option>
-                  <option value="certificate">Zertifikat</option>
-                </select>
-              </div>
-
-              {/* Title */}
-              <div className="flex flex-col gap-2">
-                <Label htmlFor="title">Titel / Bezeichnung</Label>
-                <Input
-                  id="title"
-                  name="title"
-                  placeholder={`z.B. ${selectedLabel} für Max Mustermann`}
-                  required
-                />
-              </div>
-
-              {/* Format */}
-              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
-                <div className="flex flex-col gap-2">
-                  <Label htmlFor="format">Format</Label>
-                  <select
-                    id="format"
-                    name="format"
-                    className="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2"
-                  >
-                    <option value="A4">A4</option>
-                    <option value="A5">A5</option>
-                    <option value="letter">Letter</option>
-                  </select>
-                </div>
-                <div className="flex flex-col gap-2">
-                  <Label htmlFor="orientation">Ausrichtung</Label>
-                  <select
-                    id="orientation"
-                    name="orientation"
-                    className="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2"
-                  >
-                    <option value="portrait">Hochformat</option>
-                    <option value="landscape">Querformat</option>
-                  </select>
-                </div>
-              </div>
-
-              {/* Info */}
-              <div className="rounded-md bg-muted/50 p-4 text-sm text-muted-foreground">
-                <p>
-                  <strong>Hinweis:</strong> Die Dokumentgenerierung verwendet
-                  Ihre gespeicherten Vorlagen. Stellen Sie sicher, dass eine
-                  passende Vorlage für den gewählten Dokumenttyp existiert.
-                </p>
-              </div>
-            </form>
+            <GenerateDocumentForm
+              accountSlug={account}
+              initialType={selectedType}
+            />
           </CardContent>
 
-          <CardFooter className="flex justify-between">
+          <CardFooter>
             <Link href={`/home/${account}/documents`}>
               <Button variant="outline">Abbrechen</Button>
             </Link>
-            <Button type="submit">
-              <FileDown className="mr-2 h-4 w-4" />
-              Generieren
-            </Button>
           </CardFooter>
         </Card>
       </div>
diff --git a/apps/web/app/[locale]/home/[account]/documents/page.tsx b/apps/web/app/[locale]/home/[account]/documents/page.tsx
index f2944ab01..b480df5c1 100644
--- a/apps/web/app/[locale]/home/[account]/documents/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/documents/page.tsx
@@ -14,6 +14,7 @@ import { Button } from '@kit/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -80,25 +81,16 @@ export default async function DocumentsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
-    <CmsPageShell account={account} title="Dokumente">
+    <CmsPageShell account={account} title="Dokumente" description="Dokumente erstellen und verwalten">
       <div className="flex w-full flex-col gap-6">
-        {/* Header */}
-        <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-2xl font-bold">Dokumente</h1>
-            <p className="text-muted-foreground">
-              Dokumente erstellen und verwalten
-            </p>
-          </div>
-
-          <div className="flex gap-2">
-            <Link href={`/home/${account}/documents/templates`}>
-              <Button variant="outline">Vorlagen</Button>
-            </Link>
-          </div>
+        {/* Actions */}
+        <div className="flex items-center justify-end">
+          <Link href={`/home/${account}/documents/templates`}>
+            <Button variant="outline">Vorlagen verwalten</Button>
+          </Link>
         </div>
 
         {/* Document Type Grid */}
diff --git a/apps/web/app/[locale]/home/[account]/documents/templates/page.tsx b/apps/web/app/[locale]/home/[account]/documents/templates/page.tsx
index 8a0314185..9e7b2ac8f 100644
--- a/apps/web/app/[locale]/home/[account]/documents/templates/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/documents/templates/page.tsx
@@ -8,6 +8,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -23,7 +24,7 @@ export default async function DocumentTemplatesPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   // Document templates are stored locally for now — placeholder for future DB integration
   const templates: Array<{
diff --git a/apps/web/app/[locale]/home/[account]/events/holiday-passes/page.tsx b/apps/web/app/[locale]/home/[account]/events/holiday-passes/page.tsx
index e1daa5f0a..f6387232f 100644
--- a/apps/web/app/[locale]/home/[account]/events/holiday-passes/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/events/holiday-passes/page.tsx
@@ -1,5 +1,6 @@
 import { Ticket, Plus } from 'lucide-react';
 
+import { getTranslations } from 'next-intl/server';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Button } from '@kit/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
@@ -8,6 +9,7 @@ import { createEventManagementApi } from '@kit/event-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -16,6 +18,7 @@ interface PageProps {
 export default async function HolidayPassesPage({ params }: PageProps) {
   const { account } = await params;
   const client = getSupabaseServerClient();
+  const t = await getTranslations('cms.events');
 
   const { data: acct } = await client
     .from('accounts')
@@ -23,47 +26,47 @@ export default async function HolidayPassesPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createEventManagementApi(client);
   const passes = await api.listHolidayPasses(acct.id);
 
   return (
-    <CmsPageShell account={account} title="Ferienpässe">
+    <CmsPageShell account={account} title={t('holidayPasses')}>
       <div className="flex w-full flex-col gap-6">
         <div className="flex items-center justify-between">
           <div>
-            <h1 className="text-2xl font-bold">Ferienpässe</h1>
-            <p className="text-muted-foreground">Ferienpässe und Ferienprogramme verwalten</p>
+            <h1 className="text-2xl font-bold">{t('holidayPasses')}</h1>
+            <p className="text-muted-foreground">{t('holidayPassesDescription')}</p>
           </div>
           <Button>
             <Plus className="mr-2 h-4 w-4" />
-            Neuer Ferienpass
+            {t('newHolidayPass')}
           </Button>
         </div>
 
         {passes.length === 0 ? (
           <EmptyState
             icon={<Ticket className="h-8 w-8" />}
-            title="Keine Ferienpässe vorhanden"
-            description="Erstellen Sie Ihren ersten Ferienpass."
-            actionLabel="Neuer Ferienpass"
+            title={t('noHolidayPasses')}
+            description={t('noHolidayPassesDescription')}
+            actionLabel={t('newHolidayPass')}
           />
         ) : (
           <Card>
             <CardHeader>
-              <CardTitle>Alle Ferienpässe ({passes.length})</CardTitle>
+              <CardTitle>{t('allHolidayPasses')} ({passes.length})</CardTitle>
             </CardHeader>
             <CardContent>
               <div className="rounded-md border">
                 <table className="w-full text-sm">
                   <thead>
                     <tr className="border-b bg-muted/50">
-                      <th className="p-3 text-left font-medium">Name</th>
-                      <th className="p-3 text-left font-medium">Jahr</th>
-                      <th className="p-3 text-right font-medium">Preis</th>
-                      <th className="p-3 text-left font-medium">Gültig von</th>
-                      <th className="p-3 text-left font-medium">Gültig bis</th>
+                      <th className="p-3 text-left font-medium">{t('name')}</th>
+                      <th className="p-3 text-left font-medium">{t('year')}</th>
+                      <th className="p-3 text-right font-medium">{t('price')}</th>
+                      <th className="p-3 text-left font-medium">{t('validFrom')}</th>
+                      <th className="p-3 text-left font-medium">{t('validUntil')}</th>
                     </tr>
                   </thead>
                   <tbody>
diff --git a/apps/web/app/[locale]/home/[account]/events/new/page.tsx b/apps/web/app/[locale]/home/[account]/events/new/page.tsx
index 88ef8f21e..59c2395b8 100644
--- a/apps/web/app/[locale]/home/[account]/events/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/events/new/page.tsx
@@ -1,17 +1,20 @@
+import { getTranslations } from 'next-intl/server';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { CreateEventForm } from '@kit/event-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
 export default async function NewEventPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
+  const t = await getTranslations('cms.events');
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
-    <CmsPageShell account={account} title="Neue Veranstaltung" description="Veranstaltung oder Ferienprogramm anlegen">
+    <CmsPageShell account={account} title={t('newEvent')} description={t('newEventDescription')}>
       <CreateEventForm accountId={acct.id} account={account} />
     </CmsPageShell>
   );
diff --git a/apps/web/app/[locale]/home/[account]/events/page.tsx b/apps/web/app/[locale]/home/[account]/events/page.tsx
index 6c1d8a26a..707d3bc95 100644
--- a/apps/web/app/[locale]/home/[account]/events/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/events/page.tsx
@@ -1,7 +1,8 @@
 import Link from 'next/link';
 
-import { CalendarDays, MapPin, Plus, Users } from 'lucide-react';
+import { CalendarDays, ChevronLeft, ChevronRight, MapPin, Plus, Users } from 'lucide-react';
 
+import { getTranslations } from 'next-intl/server';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Badge } from '@kit/ui/badge';
 import { Button } from '@kit/ui/button';
@@ -12,35 +13,19 @@ import { createEventManagementApi } from '@kit/event-management/api';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
+import { EVENT_STATUS_VARIANT, EVENT_STATUS_LABEL } from '~/lib/status-badges';
 
 interface PageProps {
   params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
 }
 
-const STATUS_BADGE_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  draft: 'secondary',
-  published: 'default',
-  registration_open: 'info',
-  registration_closed: 'outline',
-  cancelled: 'destructive',
-  completed: 'outline',
-};
-
-const STATUS_LABEL: Record<string, string> = {
-  draft: 'Entwurf',
-  published: 'Veröffentlicht',
-  registration_open: 'Anmeldung offen',
-  registration_closed: 'Anmeldung geschlossen',
-  cancelled: 'Abgesagt',
-  completed: 'Abgeschlossen',
-};
-
-export default async function EventsPage({ params }: PageProps) {
+export default async function EventsPage({ params, searchParams }: PageProps) {
   const { account } = await params;
+  const search = await searchParams;
   const client = getSupabaseServerClient();
+  const t = await getTranslations('cms.events');
 
   const { data: acct } = await client
     .from('accounts')
@@ -48,27 +33,45 @@ export default async function EventsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
+  const page = Number(search.page) || 1;
   const api = createEventManagementApi(client);
-  const events = await api.listEvents(acct.id, { page: 1 });
+  const events = await api.listEvents(acct.id, { page });
+
+  // Fetch registration counts for all events on this page
+  const eventIds = events.data.map((e: Record<string, unknown>) => String(e.id));
+  const registrationCounts = await api.getRegistrationCounts(eventIds);
+
+  // Pre-compute stats before rendering
+  const uniqueLocationCount = new Set(
+    events.data
+      .map((e: Record<string, unknown>) => e.location)
+      .filter(Boolean),
+  ).size;
+
+  const totalCapacity = events.data.reduce(
+    (sum: number, e: Record<string, unknown>) =>
+      sum + (Number(e.capacity) || 0),
+    0,
+  );
 
   return (
-    <CmsPageShell account={account} title="Veranstaltungen">
+    <CmsPageShell account={account} title={t('title')}>
       <div className="flex w-full flex-col gap-6">
         {/* Header */}
         <div className="flex items-center justify-between">
           <div>
-            <h1 className="text-2xl font-bold">Veranstaltungen</h1>
+            <h1 className="text-2xl font-bold">{t('title')}</h1>
             <p className="text-muted-foreground">
-              Veranstaltungen und Ferienprogramme
+              {t('description')}
             </p>
           </div>
 
           <Link href={`/home/${account}/events/new`}>
             <Button>
               <Plus className="mr-2 h-4 w-4" />
-              Neue Veranstaltung
+              {t('newEvent')}
             </Button>
           </Link>
         </div>
@@ -76,28 +79,18 @@ export default async function EventsPage({ params }: PageProps) {
         {/* Stats */}
         <div className="grid grid-cols-1 gap-4 sm:grid-cols-3">
           <StatsCard
-            title="Veranstaltungen"
+            title={t('title')}
             value={events.total}
             icon={<CalendarDays className="h-5 w-5" />}
           />
           <StatsCard
-            title="Orte"
-            value={
-              new Set(
-                events.data
-                  .map((e: Record<string, unknown>) => e.location)
-                  .filter(Boolean),
-              ).size
-            }
+            title={t('locations')}
+            value={uniqueLocationCount}
             icon={<MapPin className="h-5 w-5" />}
           />
           <StatsCard
-            title="Kapazität gesamt"
-            value={events.data.reduce(
-              (sum: number, e: Record<string, unknown>) =>
-                sum + (Number(e.capacity) || 0),
-              0,
-            )}
+            title={t('totalCapacity')}
+            value={totalCapacity}
             icon={<Users className="h-5 w-5" />}
           />
         </div>
@@ -106,71 +99,105 @@ export default async function EventsPage({ params }: PageProps) {
         {events.data.length === 0 ? (
           <EmptyState
             icon={<CalendarDays className="h-8 w-8" />}
-            title="Keine Veranstaltungen vorhanden"
-            description="Erstellen Sie Ihre erste Veranstaltung, um loszulegen."
-            actionLabel="Neue Veranstaltung"
+            title={t('noEvents')}
+            description={t('noEventsDescription')}
+            actionLabel={t('newEvent')}
             actionHref={`/home/${account}/events/new`}
           />
         ) : (
           <Card>
             <CardHeader>
-              <CardTitle>Alle Veranstaltungen ({events.total})</CardTitle>
+              <CardTitle>{t('allEvents')} ({events.total})</CardTitle>
             </CardHeader>
             <CardContent>
               <div className="rounded-md border">
                 <table className="w-full text-sm">
                   <thead>
                     <tr className="border-b bg-muted/50">
-                      <th className="p-3 text-left font-medium">Name</th>
-                      <th className="p-3 text-left font-medium">Datum</th>
-                      <th className="p-3 text-left font-medium">Ort</th>
-                      <th className="p-3 text-right font-medium">Kapazität</th>
-                      <th className="p-3 text-left font-medium">Status</th>
-                      <th className="p-3 text-right font-medium">Anmeldungen</th>
+                      <th className="p-3 text-left font-medium">{t('name')}</th>
+                      <th className="p-3 text-left font-medium">{t('eventDate')}</th>
+                      <th className="p-3 text-left font-medium">{t('eventLocation')}</th>
+                      <th className="p-3 text-right font-medium">{t('capacity')}</th>
+                      <th className="p-3 text-left font-medium">{t('status')}</th>
+                      <th className="p-3 text-right font-medium">{t('registrations')}</th>
                     </tr>
                   </thead>
                   <tbody>
-                    {events.data.map((event: Record<string, unknown>) => (
-                      <tr
-                        key={String(event.id)}
-                        className="border-b hover:bg-muted/30"
-                      >
-                        <td className="p-3 font-medium">
-                          <Link
-                            href={`/home/${account}/events/${String(event.id)}`}
-                            className="hover:underline"
-                          >
-                            {String(event.name)}
-                          </Link>
-                        </td>
-                        <td className="p-3">
-                          {event.event_date
-                            ? new Date(String(event.event_date)).toLocaleDateString('de-DE')
-                            : '—'}
-                        </td>
-                        <td className="p-3">
-                          {String(event.location ?? '—')}
-                        </td>
-                        <td className="p-3 text-right">
-                          {event.capacity != null
-                            ? String(event.capacity)
-                            : '—'}
-                        </td>
-                        <td className="p-3">
-                          <Badge
-                            variant={
-                              STATUS_BADGE_VARIANT[String(event.status)] ?? 'secondary'
-                            }
-                          >
-                            {STATUS_LABEL[String(event.status)] ?? String(event.status)}
-                          </Badge>
-                        </td>
-                        <td className="p-3 text-right">—</td>
-                      </tr>
-                    ))}
+                    {events.data.map((event: Record<string, unknown>) => {
+                      const eventId = String(event.id);
+                      const regCount = registrationCounts[eventId] ?? 0;
+
+                      return (
+                        <tr
+                          key={eventId}
+                          className="border-b hover:bg-muted/30"
+                        >
+                          <td className="p-3 font-medium">
+                            <Link
+                              href={`/home/${account}/events/${eventId}`}
+                              className="hover:underline"
+                            >
+                              {String(event.name)}
+                            </Link>
+                          </td>
+                          <td className="p-3">
+                            {event.event_date
+                              ? new Date(String(event.event_date)).toLocaleDateString('de-DE')
+                              : '—'}
+                          </td>
+                          <td className="p-3">
+                            {String(event.location ?? '—')}
+                          </td>
+                          <td className="p-3 text-right">
+                            {event.capacity != null
+                              ? String(event.capacity)
+                              : '—'}
+                          </td>
+                          <td className="p-3">
+                            <Badge
+                              variant={
+                                EVENT_STATUS_VARIANT[String(event.status)] ?? 'secondary'
+                              }
+                            >
+                              {EVENT_STATUS_LABEL[String(event.status)] ?? String(event.status)}
+                            </Badge>
+                          </td>
+                          <td className="p-3 text-right font-medium">
+                            {regCount}
+                          </td>
+                        </tr>
+                      );
+                    })}
                   </tbody>
                 </table>
               </div>
+
+              {/* Pagination */}
+              {events.totalPages > 1 && (
+                <div className="flex items-center justify-between pt-4">
+                  <span className="text-sm text-muted-foreground">
+                    {t('paginationPage', { page: events.page, totalPages: events.totalPages })}
+                  </span>
+                  <div className="flex gap-2">
+                    {events.page > 1 && (
+                      <Link href={`/home/${account}/events?page=${events.page - 1}`}>
+                        <Button variant="outline" size="sm">
+                          <ChevronLeft className="mr-1 h-4 w-4" />
+                          {t('paginationPrevious')}
+                        </Button>
+                      </Link>
+                    )}
+                    {events.page < events.totalPages && (
+                      <Link href={`/home/${account}/events?page=${events.page + 1}`}>
+                        <Button variant="outline" size="sm">
+                          {t('paginationNext')}
+                          <ChevronRight className="ml-1 h-4 w-4" />
+                        </Button>
+                      </Link>
+                    )}
+                  </div>
+                </div>
+              )}
             </CardContent>
           </Card>
         )}
diff --git a/apps/web/app/[locale]/home/[account]/events/registrations/page.tsx b/apps/web/app/[locale]/home/[account]/events/registrations/page.tsx
index 5d3e816aa..e4ca2280f 100644
--- a/apps/web/app/[locale]/home/[account]/events/registrations/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/events/registrations/page.tsx
@@ -2,9 +2,9 @@ import Link from 'next/link';
 
 import { CalendarDays, ClipboardList, Users } from 'lucide-react';
 
+import { getTranslations } from 'next-intl/server';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Badge } from '@kit/ui/badge';
-import { Button } from '@kit/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
 
 import { createEventManagementApi } from '@kit/event-management/api';
@@ -12,6 +12,8 @@ import { createEventManagementApi } from '@kit/event-management/api';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
+import { EVENT_STATUS_VARIANT, EVENT_STATUS_LABEL } from '~/lib/status-badges';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -20,6 +22,7 @@ interface PageProps {
 export default async function EventRegistrationsPage({ params }: PageProps) {
   const { account } = await params;
   const client = getSupabaseServerClient();
+  const t = await getTranslations('cms.events');
 
   const { data: acct } = await client
     .from('accounts')
@@ -27,7 +30,7 @@ export default async function EventRegistrationsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createEventManagementApi(client);
   const events = await api.listEvents(acct.id, { page: 1 });
@@ -56,30 +59,30 @@ export default async function EventRegistrationsPage({ params }: PageProps) {
   );
 
   return (
-    <CmsPageShell account={account} title="Anmeldungen">
+    <CmsPageShell account={account} title={t('registrations')}>
       <div className="flex w-full flex-col gap-6">
         {/* Header */}
         <div>
-          <h1 className="text-2xl font-bold">Anmeldungen</h1>
+          <h1 className="text-2xl font-bold">{t('registrations')}</h1>
           <p className="text-muted-foreground">
-            Anmeldungen aller Veranstaltungen im Überblick
+            {t('registrationsOverview')}
           </p>
         </div>
 
         {/* Stats */}
         <div className="grid grid-cols-1 gap-4 sm:grid-cols-3">
           <StatsCard
-            title="Veranstaltungen"
+            title={t('title')}
             value={events.total}
             icon={<CalendarDays className="h-5 w-5" />}
           />
           <StatsCard
-            title="Anmeldungen gesamt"
+            title={t('totalRegistrations')}
             value={totalRegistrations}
             icon={<ClipboardList className="h-5 w-5" />}
           />
           <StatsCard
-            title="Mit Anmeldungen"
+            title={t('withRegistrations')}
             value={eventsWithRegs.length}
             icon={<Users className="h-5 w-5" />}
           />
@@ -89,16 +92,16 @@ export default async function EventRegistrationsPage({ params }: PageProps) {
         {eventsWithRegistrations.length === 0 ? (
           <EmptyState
             icon={<ClipboardList className="h-8 w-8" />}
-            title="Keine Veranstaltungen vorhanden"
-            description="Erstellen Sie eine Veranstaltung, um Anmeldungen zu erhalten."
-            actionLabel="Neue Veranstaltung"
+            title={t('noEvents')}
+            description={t('noEventsForRegistrations')}
+            actionLabel={t('newEvent')}
             actionHref={`/home/${account}/events/new`}
           />
         ) : (
           <Card>
             <CardHeader>
               <CardTitle>
-                Übersicht nach Veranstaltung ({eventsWithRegistrations.length})
+                {t('overviewByEvent')} ({eventsWithRegistrations.length})
               </CardTitle>
             </CardHeader>
             <CardContent>
@@ -107,15 +110,15 @@ export default async function EventRegistrationsPage({ params }: PageProps) {
                   <thead>
                     <tr className="border-b bg-muted/50">
                       <th className="p-3 text-left font-medium">
-                        Veranstaltung
+                        {t('event')}
                       </th>
-                      <th className="p-3 text-left font-medium">Datum</th>
-                      <th className="p-3 text-left font-medium">Status</th>
-                      <th className="p-3 text-right font-medium">Kapazität</th>
+                      <th className="p-3 text-left font-medium">{t('eventDate')}</th>
+                      <th className="p-3 text-left font-medium">{t('status')}</th>
+                      <th className="p-3 text-right font-medium">{t('capacity')}</th>
                       <th className="p-3 text-right font-medium">
-                        Anmeldungen
+                        {t('registrations')}
                       </th>
-                      <th className="p-3 text-right font-medium">Auslastung</th>
+                      <th className="p-3 text-right font-medium">{t('utilization')}</th>
                     </tr>
                   </thead>
                   <tbody>
@@ -148,7 +151,13 @@ export default async function EventRegistrationsPage({ params }: PageProps) {
                               : '—'}
                           </td>
                           <td className="p-3">
-                            <Badge variant="outline">{event.status}</Badge>
+                            <Badge
+                              variant={
+                                EVENT_STATUS_VARIANT[event.status] ?? 'secondary'
+                              }
+                            >
+                              {EVENT_STATUS_LABEL[event.status] ?? event.status}
+                            </Badge>
                           </td>
                           <td className="p-3 text-right">
                             {event.capacity ?? '—'}
diff --git a/apps/web/app/[locale]/home/[account]/finance/invoices/[id]/page.tsx b/apps/web/app/[locale]/home/[account]/finance/invoices/[id]/page.tsx
index 1ebbc532d..1f9f5612c 100644
--- a/apps/web/app/[locale]/home/[account]/finance/invoices/[id]/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/finance/invoices/[id]/page.tsx
@@ -10,6 +10,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
 import { createFinanceApi } from '@kit/finance/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string; id: string }>;
@@ -49,7 +50,7 @@ export default async function InvoiceDetailPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createFinanceApi(client);
   const invoice = await api.getInvoiceWithItems(id);
diff --git a/apps/web/app/[locale]/home/[account]/finance/invoices/new/page.tsx b/apps/web/app/[locale]/home/[account]/finance/invoices/new/page.tsx
index 4456e8d23..dd5f7aebf 100644
--- a/apps/web/app/[locale]/home/[account]/finance/invoices/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/finance/invoices/new/page.tsx
@@ -1,6 +1,7 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { CreateInvoiceForm } from '@kit/finance/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -8,7 +9,7 @@ export default async function NewInvoicePage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
     <CmsPageShell account={account} title="Neue Rechnung" description="Rechnung mit Positionen erstellen">
diff --git a/apps/web/app/[locale]/home/[account]/finance/invoices/page.tsx b/apps/web/app/[locale]/home/[account]/finance/invoices/page.tsx
index ed12b797f..60f81aeb6 100644
--- a/apps/web/app/[locale]/home/[account]/finance/invoices/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/finance/invoices/page.tsx
@@ -11,30 +11,16 @@ import { createFinanceApi } from '@kit/finance/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
+import {
+  INVOICE_STATUS_VARIANT,
+  INVOICE_STATUS_LABEL,
+} from '~/lib/status-badges';
 
 interface PageProps {
   params: Promise<{ account: string }>;
 }
 
-const STATUS_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  draft: 'secondary',
-  sent: 'default',
-  paid: 'info',
-  overdue: 'destructive',
-  cancelled: 'destructive',
-};
-
-const STATUS_LABEL: Record<string, string> = {
-  draft: 'Entwurf',
-  sent: 'Versendet',
-  paid: 'Bezahlt',
-  overdue: 'Überfällig',
-  cancelled: 'Storniert',
-};
-
 const formatCurrency = (amount: unknown) =>
   new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(
     Number(amount),
@@ -50,7 +36,7 @@ export default async function InvoicesPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createFinanceApi(client);
   const invoices = await api.listInvoices(acct.id);
@@ -141,10 +127,10 @@ export default async function InvoicesPage({ params }: PageProps) {
                           <td className="p-3">
                             <Badge
                               variant={
-                                STATUS_VARIANT[status] ?? 'secondary'
+                                INVOICE_STATUS_VARIANT[status] ?? 'secondary'
                               }
                             >
-                              {STATUS_LABEL[status] ?? status}
+                              {INVOICE_STATUS_LABEL[status] ?? status}
                             </Badge>
                           </td>
                         </tr>
diff --git a/apps/web/app/[locale]/home/[account]/finance/page.tsx b/apps/web/app/[locale]/home/[account]/finance/page.tsx
index 550aff88c..8f3a708eb 100644
--- a/apps/web/app/[locale]/home/[account]/finance/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/finance/page.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-import { Landmark, FileText, Euro, ArrowRight } from 'lucide-react';
+import { Landmark, FileText, Euro, ArrowRight, Plus } from 'lucide-react';
 
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Badge } from '@kit/ui/badge';
@@ -12,49 +12,18 @@ import { createFinanceApi } from '@kit/finance/api';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
+import {
+  BATCH_STATUS_VARIANT,
+  BATCH_STATUS_LABEL,
+  INVOICE_STATUS_VARIANT,
+  INVOICE_STATUS_LABEL,
+} from '~/lib/status-badges';
 
 interface PageProps {
   params: Promise<{ account: string }>;
 }
 
-const BATCH_STATUS_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  draft: 'secondary',
-  ready: 'default',
-  submitted: 'info',
-  completed: 'outline',
-  failed: 'destructive',
-};
-
-const BATCH_STATUS_LABEL: Record<string, string> = {
-  draft: 'Entwurf',
-  ready: 'Bereit',
-  submitted: 'Eingereicht',
-  completed: 'Abgeschlossen',
-  failed: 'Fehlgeschlagen',
-};
-
-const INVOICE_STATUS_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  draft: 'secondary',
-  sent: 'default',
-  paid: 'info',
-  overdue: 'destructive',
-  cancelled: 'destructive',
-};
-
-const INVOICE_STATUS_LABEL: Record<string, string> = {
-  draft: 'Entwurf',
-  sent: 'Versendet',
-  paid: 'Bezahlt',
-  overdue: 'Überfällig',
-  cancelled: 'Storniert',
-};
-
 export default async function FinancePage({ params }: PageProps) {
   const { account } = await params;
   const client = getSupabaseServerClient();
@@ -65,7 +34,7 @@ export default async function FinancePage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createFinanceApi(client);
 
@@ -89,11 +58,27 @@ export default async function FinancePage({ params }: PageProps) {
     <CmsPageShell account={account} title="Finanzen">
       <div className="flex w-full flex-col gap-6">
         {/* Header */}
-        <div>
-          <h1 className="text-2xl font-bold">Finanzen</h1>
-          <p className="text-muted-foreground">
-            SEPA-Einzüge und Rechnungen
-          </p>
+        <div className="flex items-center justify-between">
+          <div>
+            <h1 className="text-2xl font-bold">Finanzen</h1>
+            <p className="text-muted-foreground">
+              SEPA-Einzüge und Rechnungen
+            </p>
+          </div>
+          <div className="flex gap-2">
+            <Link href={`/home/${account}/finance/invoices/new`}>
+              <Button variant="outline">
+                <Plus className="mr-2 h-4 w-4" />
+                Neue Rechnung
+              </Button>
+            </Link>
+            <Link href={`/home/${account}/finance/sepa/new`}>
+              <Button>
+                <Plus className="mr-2 h-4 w-4" />
+                Neuer SEPA-Einzug
+              </Button>
+            </Link>
+          </div>
         </div>
 
         {/* Stats */}
@@ -147,7 +132,7 @@ export default async function FinancePage({ params }: PageProps) {
                     </tr>
                   </thead>
                   <tbody>
-                    {batches.slice(0, 5).map((batch: Record<string, unknown>) => (
+                    {batches.map((batch: Record<string, unknown>) => (
                       <tr
                         key={String(batch.id)}
                         className="border-b hover:bg-muted/30"
@@ -219,7 +204,7 @@ export default async function FinancePage({ params }: PageProps) {
                     </tr>
                   </thead>
                   <tbody>
-                    {invoices.slice(0, 5).map((invoice: Record<string, unknown>) => (
+                    {invoices.map((invoice: Record<string, unknown>) => (
                       <tr
                         key={String(invoice.id)}
                         className="border-b hover:bg-muted/30"
diff --git a/apps/web/app/[locale]/home/[account]/finance/payments/page.tsx b/apps/web/app/[locale]/home/[account]/finance/payments/page.tsx
index be457cf9d..8100f968a 100644
--- a/apps/web/app/[locale]/home/[account]/finance/payments/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/finance/payments/page.tsx
@@ -11,6 +11,7 @@ import { createFinanceApi } from '@kit/finance/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -31,7 +32,7 @@ export default async function PaymentsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createFinanceApi(client);
 
diff --git a/apps/web/app/[locale]/home/[account]/finance/sepa/[batchId]/page.tsx b/apps/web/app/[locale]/home/[account]/finance/sepa/[batchId]/page.tsx
index 77b0381dd..d93f3699d 100644
--- a/apps/web/app/[locale]/home/[account]/finance/sepa/[batchId]/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/finance/sepa/[batchId]/page.tsx
@@ -10,6 +10,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
 import { createFinanceApi } from '@kit/finance/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string; batchId: string }>;
@@ -64,7 +65,7 @@ export default async function SepaBatchDetailPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createFinanceApi(client);
 
diff --git a/apps/web/app/[locale]/home/[account]/finance/sepa/new/page.tsx b/apps/web/app/[locale]/home/[account]/finance/sepa/new/page.tsx
index 5dd9a318d..05675aee9 100644
--- a/apps/web/app/[locale]/home/[account]/finance/sepa/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/finance/sepa/new/page.tsx
@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { CreateSepaBatchForm } from '@kit/finance/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props {
   params: Promise<{ account: string }>;
@@ -17,7 +18,7 @@ export default async function NewSepaBatchPage({ params }: Props) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
     <CmsPageShell account={account} title="Neuer SEPA-Einzug" description="SEPA-Lastschrifteinzug erstellen">
diff --git a/apps/web/app/[locale]/home/[account]/finance/sepa/page.tsx b/apps/web/app/[locale]/home/[account]/finance/sepa/page.tsx
index e2e07fde5..e68d597ca 100644
--- a/apps/web/app/[locale]/home/[account]/finance/sepa/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/finance/sepa/page.tsx
@@ -11,30 +11,16 @@ import { createFinanceApi } from '@kit/finance/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
+import {
+  BATCH_STATUS_VARIANT,
+  BATCH_STATUS_LABEL,
+} from '~/lib/status-badges';
 
 interface PageProps {
   params: Promise<{ account: string }>;
 }
 
-const STATUS_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  draft: 'secondary',
-  ready: 'default',
-  submitted: 'info',
-  completed: 'outline',
-  failed: 'destructive',
-};
-
-const STATUS_LABEL: Record<string, string> = {
-  draft: 'Entwurf',
-  ready: 'Bereit',
-  submitted: 'Eingereicht',
-  completed: 'Abgeschlossen',
-  failed: 'Fehlgeschlagen',
-};
-
 const formatCurrency = (amount: unknown) =>
   new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(
     Number(amount),
@@ -50,7 +36,7 @@ export default async function SepaPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createFinanceApi(client);
   const batches = await api.listBatches(acct.id);
@@ -115,10 +101,10 @@ export default async function SepaPage({ params }: PageProps) {
                         <td className="p-3">
                           <Badge
                             variant={
-                              STATUS_VARIANT[String(batch.status)] ?? 'secondary'
+                              BATCH_STATUS_VARIANT[String(batch.status)] ?? 'secondary'
                             }
                           >
-                            {STATUS_LABEL[String(batch.status)] ??
+                            {BATCH_STATUS_LABEL[String(batch.status)] ??
                               String(batch.status)}
                           </Badge>
                         </td>
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/catch-books/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/catch-books/page.tsx
new file mode 100644
index 000000000..fe1b9ebec
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/catch-books/page.tsx
@@ -0,0 +1,47 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation, CatchBooksDataTable } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function CatchBooksPage({ params, searchParams }: Props) {
+  const { account } = await params;
+  const search = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+  const page = Number(search.page) || 1;
+  const result = await api.listCatchBooks(acct.id, {
+    year: search.year ? Number(search.year) : undefined,
+    status: search.status as string,
+    page,
+    pageSize: 25,
+  });
+
+  return (
+    <CmsPageShell account={account} title="Fischerei - Fangbücher">
+      <FischereiTabNavigation account={account} activeTab="catch-books" />
+      <CatchBooksDataTable
+        data={result.data}
+        total={result.total}
+        page={page}
+        pageSize={25}
+        account={account}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/competitions/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/competitions/page.tsx
new file mode 100644
index 000000000..5d093076a
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/competitions/page.tsx
@@ -0,0 +1,45 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation, CompetitionsDataTable } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function CompetitionsPage({ params, searchParams }: Props) {
+  const { account } = await params;
+  const search = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+  const page = Number(search.page) || 1;
+  const result = await api.listCompetitions(acct.id, {
+    page,
+    pageSize: 25,
+  });
+
+  return (
+    <CmsPageShell account={account} title="Fischerei - Wettbewerbe">
+      <FischereiTabNavigation account={account} activeTab="competitions" />
+      <CompetitionsDataTable
+        data={result.data}
+        total={result.total}
+        page={page}
+        pageSize={25}
+        account={account}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/layout.tsx b/apps/web/app/[locale]/home/[account]/fischerei/layout.tsx
new file mode 100644
index 000000000..463e90960
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/layout.tsx
@@ -0,0 +1,5 @@
+import { ReactNode } from 'react';
+
+export default function FischereiLayout({ children }: { children: ReactNode }) {
+  return <>{children}</>;
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/leases/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/leases/page.tsx
new file mode 100644
index 000000000..b3fb6ca6b
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/leases/page.tsx
@@ -0,0 +1,119 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { Badge } from '@kit/ui/badge';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+import { LEASE_PAYMENT_LABELS } from '@kit/fischerei/lib/fischerei-constants';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function LeasesPage({ params, searchParams }: Props) {
+  const { account } = await params;
+  const search = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+  const page = Number(search.page) || 1;
+  const result = await api.listLeases(acct.id, {
+    page,
+    pageSize: 25,
+  });
+
+  return (
+    <CmsPageShell account={account} title="Fischerei - Pachten">
+      <FischereiTabNavigation account={account} activeTab="leases" />
+      <div className="flex w-full flex-col gap-6">
+        <div>
+          <h1 className="text-2xl font-bold">Pachten</h1>
+          <p className="text-muted-foreground">
+            Gewässerpachtverträge verwalten
+          </p>
+        </div>
+        <Card>
+          <CardHeader>
+            <CardTitle>Pachten ({result.total})</CardTitle>
+          </CardHeader>
+          <CardContent>
+            {result.data.length === 0 ? (
+              <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+                <h3 className="text-lg font-semibold">
+                  Keine Pachten vorhanden
+                </h3>
+                <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                  Erstellen Sie Ihren ersten Pachtvertrag.
+                </p>
+              </div>
+            ) : (
+              <div className="rounded-md border">
+                <table className="w-full text-sm">
+                  <thead>
+                    <tr className="border-b bg-muted/50">
+                      <th className="p-3 text-left font-medium">Verpächter</th>
+                      <th className="p-3 text-left font-medium">Gewässer</th>
+                      <th className="p-3 text-left font-medium">Beginn</th>
+                      <th className="p-3 text-left font-medium">Ende</th>
+                      <th className="p-3 text-right font-medium">Jahresbetrag (€)</th>
+                      <th className="p-3 text-left font-medium">Zahlungsart</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {result.data.map((lease: Record<string, unknown>) => {
+                      const waters = lease.waters as Record<string, unknown> | null;
+                      const paymentMethod = String(lease.payment_method ?? 'ueberweisung');
+
+                      return (
+                        <tr key={String(lease.id)} className="border-b hover:bg-muted/30">
+                          <td className="p-3 font-medium">
+                            {String(lease.lessor_name)}
+                          </td>
+                          <td className="p-3">
+                            {waters ? String(waters.name) : '—'}
+                          </td>
+                          <td className="p-3">
+                            {lease.start_date
+                              ? new Date(String(lease.start_date)).toLocaleDateString('de-DE')
+                              : '—'}
+                          </td>
+                          <td className="p-3">
+                            {lease.end_date
+                              ? new Date(String(lease.end_date)).toLocaleDateString('de-DE')
+                              : 'unbefristet'}
+                          </td>
+                          <td className="p-3 text-right">
+                            {lease.initial_amount != null
+                              ? `${Number(lease.initial_amount).toLocaleString('de-DE', { minimumFractionDigits: 2 })} €`
+                              : '—'}
+                          </td>
+                          <td className="p-3">
+                            <Badge variant="outline">
+                              {LEASE_PAYMENT_LABELS[paymentMethod] ?? paymentMethod}
+                            </Badge>
+                          </td>
+                        </tr>
+                      );
+                    })}
+                  </tbody>
+                </table>
+              </div>
+            )}
+          </CardContent>
+        </Card>
+      </div>
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/page.tsx
new file mode 100644
index 000000000..58cf30073
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/page.tsx
@@ -0,0 +1,33 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation, FischereiDashboard } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface PageProps {
+  params: Promise<{ account: string }>;
+}
+
+export default async function FischereiPage({ params }: PageProps) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+  const stats = await api.getDashboardStats(acct.id);
+
+  return (
+    <CmsPageShell account={account} title="Fischerei">
+      <FischereiTabNavigation account={account} activeTab="overview" />
+      <FischereiDashboard stats={stats} account={account} />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/permits/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/permits/page.tsx
new file mode 100644
index 000000000..64e0fc926
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/permits/page.tsx
@@ -0,0 +1,97 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+}
+
+export default async function PermitsPage({ params }: Props) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+  const permits = await api.listPermits(acct.id);
+
+  return (
+    <CmsPageShell account={account} title="Fischerei - Erlaubnisscheine">
+      <FischereiTabNavigation account={account} activeTab="permits" />
+      <div className="flex w-full flex-col gap-6">
+        <div>
+          <h1 className="text-2xl font-bold">Erlaubnisscheine</h1>
+          <p className="text-muted-foreground">
+            Erlaubnisscheine und Gewässerkarten verwalten
+          </p>
+        </div>
+        <Card>
+          <CardHeader>
+            <CardTitle>Erlaubnisscheine ({permits.length})</CardTitle>
+          </CardHeader>
+          <CardContent>
+            {permits.length === 0 ? (
+              <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+                <h3 className="text-lg font-semibold">
+                  Keine Erlaubnisscheine vorhanden
+                </h3>
+                <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                  Erstellen Sie Ihren ersten Erlaubnisschein.
+                </p>
+              </div>
+            ) : (
+              <div className="rounded-md border">
+                <table className="w-full text-sm">
+                  <thead>
+                    <tr className="border-b bg-muted/50">
+                      <th className="p-3 text-left font-medium">Bezeichnung</th>
+                      <th className="p-3 text-left font-medium">Kurzcode</th>
+                      <th className="p-3 text-left font-medium">Hauptgewässer</th>
+                      <th className="p-3 text-right font-medium">Gesamtmenge</th>
+                      <th className="p-3 text-center font-medium">Zum Verkauf</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {permits.map((permit: Record<string, unknown>) => {
+                      const waters = permit.waters as Record<string, unknown> | null;
+
+                      return (
+                        <tr key={String(permit.id)} className="border-b hover:bg-muted/30">
+                          <td className="p-3 font-medium">{String(permit.name)}</td>
+                          <td className="p-3 text-muted-foreground">
+                            {String(permit.short_code ?? '—')}
+                          </td>
+                          <td className="p-3">
+                            {waters ? String(waters.name) : '—'}
+                          </td>
+                          <td className="p-3 text-right">
+                            {permit.total_quantity != null
+                              ? String(permit.total_quantity)
+                              : '—'}
+                          </td>
+                          <td className="p-3 text-center">
+                            {permit.is_for_sale ? '✓' : '—'}
+                          </td>
+                        </tr>
+                      );
+                    })}
+                  </tbody>
+                </table>
+              </div>
+            )}
+          </CardContent>
+        </Card>
+      </div>
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/species/new/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/species/new/page.tsx
new file mode 100644
index 000000000..c6bd36fd0
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/species/new/page.tsx
@@ -0,0 +1,29 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { FischereiTabNavigation, CreateSpeciesForm } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+}
+
+export default async function NewSpeciesPage({ params }: Props) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  return (
+    <CmsPageShell account={account} title="Neue Fischart">
+      <FischereiTabNavigation account={account} activeTab="species" />
+      <CreateSpeciesForm accountId={acct.id} account={account} />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/species/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/species/page.tsx
new file mode 100644
index 000000000..9c0b58de1
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/species/page.tsx
@@ -0,0 +1,46 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation, SpeciesDataTable } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function SpeciesPage({ params, searchParams }: Props) {
+  const { account } = await params;
+  const search = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+  const page = Number(search.page) || 1;
+  const result = await api.listSpecies(acct.id, {
+    search: search.q as string,
+    page,
+    pageSize: 50,
+  });
+
+  return (
+    <CmsPageShell account={account} title="Fischerei - Fischarten">
+      <FischereiTabNavigation account={account} activeTab="species" />
+      <SpeciesDataTable
+        data={result.data}
+        total={result.total}
+        page={page}
+        pageSize={50}
+        account={account}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/statistics/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/statistics/page.tsx
new file mode 100644
index 000000000..001ec65fd
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/statistics/page.tsx
@@ -0,0 +1,50 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { FischereiTabNavigation } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+}
+
+export default async function StatisticsPage({ params }: Props) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  return (
+    <CmsPageShell account={account} title="Fischerei - Statistiken">
+      <FischereiTabNavigation account={account} activeTab="statistics" />
+      <div className="flex w-full flex-col gap-6">
+        <div>
+          <h1 className="text-2xl font-bold">Statistiken</h1>
+          <p className="text-muted-foreground">
+            Fangstatistiken und Auswertungen
+          </p>
+        </div>
+        <Card>
+          <CardHeader>
+            <CardTitle>Fangstatistiken</CardTitle>
+          </CardHeader>
+          <CardContent>
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Noch keine Daten vorhanden</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Sobald Fangbücher eingereicht und geprüft werden, erscheinen hier Statistiken und Auswertungen.
+              </p>
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/stocking/new/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/stocking/new/page.tsx
new file mode 100644
index 000000000..dc5a2b753
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/stocking/new/page.tsx
@@ -0,0 +1,53 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation, CreateStockingForm } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+}
+
+export default async function NewStockingPage({ params }: Props) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+
+  // Load waters and species lists for form dropdowns
+  const [watersResult, speciesResult] = await Promise.all([
+    api.listWaters(acct.id, { pageSize: 200 }),
+    api.listSpecies(acct.id, { pageSize: 200 }),
+  ]);
+
+  const waters = watersResult.data.map((w: Record<string, unknown>) => ({
+    id: String(w.id),
+    name: String(w.name),
+  }));
+
+  const species = speciesResult.data.map((s: Record<string, unknown>) => ({
+    id: String(s.id),
+    name: String(s.name),
+  }));
+
+  return (
+    <CmsPageShell account={account} title="Besatz eintragen">
+      <FischereiTabNavigation account={account} activeTab="stocking" />
+      <CreateStockingForm
+        accountId={acct.id}
+        account={account}
+        waters={waters}
+        species={species}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/stocking/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/stocking/page.tsx
new file mode 100644
index 000000000..2d20b3469
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/stocking/page.tsx
@@ -0,0 +1,45 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation, StockingDataTable } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function StockingPage({ params, searchParams }: Props) {
+  const { account } = await params;
+  const search = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+  const page = Number(search.page) || 1;
+  const result = await api.listStocking(acct.id, {
+    page,
+    pageSize: 25,
+  });
+
+  return (
+    <CmsPageShell account={account} title="Fischerei - Besatz">
+      <FischereiTabNavigation account={account} activeTab="stocking" />
+      <StockingDataTable
+        data={result.data}
+        total={result.total}
+        page={page}
+        pageSize={25}
+        account={account}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/waters/new/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/waters/new/page.tsx
new file mode 100644
index 000000000..ac130cf93
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/waters/new/page.tsx
@@ -0,0 +1,29 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { FischereiTabNavigation, CreateWaterForm } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+}
+
+export default async function NewWaterPage({ params }: Props) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  return (
+    <CmsPageShell account={account} title="Neues Gewässer">
+      <FischereiTabNavigation account={account} activeTab="waters" />
+      <CreateWaterForm accountId={acct.id} account={account} />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/fischerei/waters/page.tsx b/apps/web/app/[locale]/home/[account]/fischerei/waters/page.tsx
new file mode 100644
index 000000000..8ded3489a
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/fischerei/waters/page.tsx
@@ -0,0 +1,47 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createFischereiApi } from '@kit/fischerei/api';
+import { FischereiTabNavigation, WatersDataTable } from '@kit/fischerei/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function WatersPage({ params, searchParams }: Props) {
+  const { account } = await params;
+  const search = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createFischereiApi(client);
+  const page = Number(search.page) || 1;
+  const result = await api.listWaters(acct.id, {
+    search: search.q as string,
+    waterType: search.type as string,
+    page,
+    pageSize: 25,
+  });
+
+  return (
+    <CmsPageShell account={account} title="Fischerei - Gewässer">
+      <FischereiTabNavigation account={account} activeTab="waters" />
+      <WatersDataTable
+        data={result.data}
+        total={result.total}
+        page={page}
+        pageSize={25}
+        account={account}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/layout.tsx b/apps/web/app/[locale]/home/[account]/layout.tsx
index b487eefca..4908b79c7 100644
--- a/apps/web/app/[locale]/home/[account]/layout.tsx
+++ b/apps/web/app/[locale]/home/[account]/layout.tsx
@@ -1,11 +1,15 @@
+import { cache } from 'react';
 import { use } from 'react';
 
 import { cookies } from 'next/headers';
 import { redirect } from 'next/navigation';
 
+import { Fish, FileSignature, Building2 } from 'lucide-react';
 import * as z from 'zod';
 
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { TeamAccountWorkspaceContextProvider } from '@kit/team-accounts/components';
+import { NavigationConfigSchema } from '@kit/ui/navigation-schema';
 import { Page, PageMobileNavigation, PageNavigation } from '@kit/ui/page';
 import { SidebarProvider } from '@kit/ui/sidebar';
 
@@ -33,21 +37,109 @@ function TeamWorkspaceLayout({ children, params }: TeamWorkspaceLayoutProps) {
   return <HeaderLayout account={account}>{children}</HeaderLayout>;
 }
 
+/**
+ * Query account_settings.features for a given account slug.
+ * Cached per-request so multiple calls don't hit the DB twice.
+ */
+const getAccountFeatures = cache(async (accountSlug: string) => {
+  const client = getSupabaseServerClient();
+
+  const { data: accountData } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', accountSlug)
+    .single();
+
+  if (!accountData) return {};
+
+  const { data: settings } = await client
+    .from('account_settings')
+    .select('features')
+    .eq('account_id', accountData.id)
+    .maybeSingle();
+
+  return (settings?.features as Record<string, boolean>) ?? {};
+});
+
+/**
+ * Inject per-account feature routes (e.g. Fischerei) into the parsed
+ * navigation config. The entry is inserted right after "Veranstaltungen".
+ */
+function injectAccountFeatureRoutes(
+  config: z.output<typeof NavigationConfigSchema>,
+  account: string,
+  features: Record<string, boolean>,
+): z.output<typeof NavigationConfigSchema> {
+  if (!features.fischerei && !features.meetings && !features.verband) return config;
+
+  const featureEntries: Array<{
+    label: string;
+    path: string;
+    Icon: React.ReactNode;
+  }> = [];
+
+  if (features.fischerei) {
+    featureEntries.push({
+      label: 'common.routes.fischerei',
+      path: `/home/${account}/fischerei`,
+      Icon: <Fish className="w-4" />,
+    });
+  }
+
+  if (features.meetings) {
+    featureEntries.push({
+      label: 'common.routes.meetings',
+      path: `/home/${account}/meetings`,
+      Icon: <FileSignature className="w-4" />,
+    });
+  }
+
+  if (features.verband) {
+    featureEntries.push({
+      label: 'common.routes.verband',
+      path: `/home/${account}/verband`,
+      Icon: <Building2 className="w-4" />,
+    });
+  }
+
+  return {
+    ...config,
+    routes: config.routes.map((group) => {
+      if (!('children' in group)) return group;
+
+      const eventsIndex = group.children.findIndex(
+        (child) => child.label === 'common.routes.events',
+      );
+
+      if (eventsIndex === -1) return group;
+
+      const newChildren = [...group.children];
+      newChildren.splice(eventsIndex + 1, 0, ...featureEntries);
+
+      return { ...group, children: newChildren };
+    }),
+  };
+}
+
 async function SidebarLayout({
   account,
   children,
 }: React.PropsWithChildren<{
   account: string;
 }>) {
-  const [data, state] = await Promise.all([
+  const [data, state, features] = await Promise.all([
     loadTeamWorkspace(account),
     getLayoutState(account),
+    getAccountFeatures(account),
   ]);
 
   if (!data) {
     redirect('/');
   }
 
+  const baseConfig = getTeamAccountSidebarConfig(account);
+  const config = injectAccountFeatureRoutes(baseConfig, account, features);
+
   const accounts = data.accounts.map(({ name, slug, picture_url }) => ({
     label: name,
     value: slug,
@@ -64,6 +156,7 @@ async function SidebarLayout({
               accountId={data.account.id}
               accounts={accounts}
               user={data.user}
+              config={config}
             />
           </PageNavigation>
 
@@ -75,6 +168,7 @@ async function SidebarLayout({
                 userId={data.user.id}
                 accounts={accounts}
                 account={account}
+                config={config}
               />
             </div>
           </PageMobileNavigation>
@@ -86,19 +180,25 @@ async function SidebarLayout({
   );
 }
 
-function HeaderLayout({
+async function HeaderLayout({
   account,
   children,
 }: React.PropsWithChildren<{
   account: string;
 }>) {
-  const data = use(loadTeamWorkspace(account));
+  const [data, features] = await Promise.all([
+    loadTeamWorkspace(account),
+    getAccountFeatures(account),
+  ]);
+
+  const baseConfig = getTeamAccountSidebarConfig(account);
+  const config = injectAccountFeatureRoutes(baseConfig, account, features);
 
   return (
     <TeamAccountWorkspaceContextProvider value={data}>
       <Page style={'header'}>
         <PageNavigation>
-          <TeamAccountNavigationMenu workspace={data} />
+          <TeamAccountNavigationMenu workspace={data} config={config} />
         </PageNavigation>
 
         {children}
diff --git a/apps/web/app/[locale]/home/[account]/meetings/layout.tsx b/apps/web/app/[locale]/home/[account]/meetings/layout.tsx
new file mode 100644
index 000000000..017f57b2e
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/meetings/layout.tsx
@@ -0,0 +1,5 @@
+import { ReactNode } from 'react';
+
+export default function MeetingsLayout({ children }: { children: ReactNode }) {
+  return <>{children}</>;
+}
diff --git a/apps/web/app/[locale]/home/[account]/meetings/page.tsx b/apps/web/app/[locale]/home/[account]/meetings/page.tsx
new file mode 100644
index 000000000..76ef7c22b
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/meetings/page.tsx
@@ -0,0 +1,43 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createMeetingsApi } from '@kit/sitzungsprotokolle/api';
+import { MeetingsTabNavigation, MeetingsDashboard } from '@kit/sitzungsprotokolle/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface PageProps {
+  params: Promise<{ account: string }>;
+}
+
+export default async function MeetingsPage({ params }: PageProps) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createMeetingsApi(client);
+
+  const [stats, recentProtocols, overdueTasks] = await Promise.all([
+    api.getDashboardStats(acct.id),
+    api.getRecentProtocols(acct.id),
+    api.getOverdueTasks(acct.id),
+  ]);
+
+  return (
+    <CmsPageShell account={account} title="Sitzungsprotokolle">
+      <MeetingsTabNavigation account={account} activeTab="overview" />
+      <MeetingsDashboard
+        stats={stats}
+        recentProtocols={recentProtocols}
+        overdueTasks={overdueTasks}
+        account={account}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/meetings/protocols/[protocolId]/page.tsx b/apps/web/app/[locale]/home/[account]/meetings/protocols/[protocolId]/page.tsx
new file mode 100644
index 000000000..310345421
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/meetings/protocols/[protocolId]/page.tsx
@@ -0,0 +1,128 @@
+import Link from 'next/link';
+
+import { ArrowLeft } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createMeetingsApi } from '@kit/sitzungsprotokolle/api';
+import { MeetingsTabNavigation, ProtocolItemsList } from '@kit/sitzungsprotokolle/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+
+import { MEETING_TYPE_LABELS } from '@kit/sitzungsprotokolle/lib/meetings-constants';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface PageProps {
+  params: Promise<{ account: string; protocolId: string }>;
+}
+
+export default async function ProtocolDetailPage({ params }: PageProps) {
+  const { account, protocolId } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createMeetingsApi(client);
+
+  let protocol;
+  try {
+    protocol = await api.getProtocol(protocolId);
+  } catch {
+    return (
+      <CmsPageShell account={account} title="Sitzungsprotokolle">
+        <div className="text-center py-12">
+          <h2 className="text-lg font-semibold">Protokoll nicht gefunden</h2>
+          <Link href={`/home/${account}/meetings/protocols`} className="mt-4 inline-block">
+            <Button variant="outline">Zurück zur Übersicht</Button>
+          </Link>
+        </div>
+      </CmsPageShell>
+    );
+  }
+
+  const items = await api.listItems(protocolId);
+
+  return (
+    <CmsPageShell account={account} title="Sitzungsprotokolle">
+      <MeetingsTabNavigation account={account} activeTab="protocols" />
+
+      <div className="space-y-6">
+        {/* Back + Title */}
+        <div className="flex items-center gap-4">
+          <Link href={`/home/${account}/meetings/protocols`}>
+            <Button variant="ghost" size="sm">
+              <ArrowLeft className="mr-2 h-4 w-4" />
+              Zurück
+            </Button>
+          </Link>
+        </div>
+
+        {/* Protocol Header */}
+        <Card>
+          <CardHeader>
+            <div className="flex items-start justify-between">
+              <div>
+                <CardTitle className="text-xl">{protocol.title}</CardTitle>
+                <div className="mt-2 flex flex-wrap items-center gap-2 text-sm text-muted-foreground">
+                  <span>
+                    {new Date(protocol.meeting_date).toLocaleDateString('de-DE', {
+                      weekday: 'long',
+                      year: 'numeric',
+                      month: 'long',
+                      day: 'numeric',
+                    })}
+                  </span>
+                  <span>·</span>
+                  <Badge variant="secondary">
+                    {MEETING_TYPE_LABELS[protocol.meeting_type] ?? protocol.meeting_type}
+                  </Badge>
+                  {protocol.is_published ? (
+                    <Badge variant="default">Veröffentlicht</Badge>
+                  ) : (
+                    <Badge variant="outline">Entwurf</Badge>
+                  )}
+                </div>
+              </div>
+            </div>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            {protocol.location && (
+              <div>
+                <p className="text-sm font-medium text-muted-foreground">Ort</p>
+                <p className="text-sm">{protocol.location}</p>
+              </div>
+            )}
+            {protocol.attendees && (
+              <div className="sm:col-span-2">
+                <p className="text-sm font-medium text-muted-foreground">Teilnehmer</p>
+                <p className="text-sm whitespace-pre-line">{protocol.attendees}</p>
+              </div>
+            )}
+            {protocol.remarks && (
+              <div className="sm:col-span-2">
+                <p className="text-sm font-medium text-muted-foreground">Anmerkungen</p>
+                <p className="text-sm whitespace-pre-line">{protocol.remarks}</p>
+              </div>
+            )}
+          </CardContent>
+        </Card>
+
+        {/* Items List */}
+        <ProtocolItemsList
+          items={items}
+          protocolId={protocolId}
+          account={account}
+        />
+      </div>
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/meetings/protocols/new/page.tsx b/apps/web/app/[locale]/home/[account]/meetings/protocols/new/page.tsx
new file mode 100644
index 000000000..737c4377a
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/meetings/protocols/new/page.tsx
@@ -0,0 +1,37 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { MeetingsTabNavigation, CreateProtocolForm } from '@kit/sitzungsprotokolle/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface PageProps {
+  params: Promise<{ account: string }>;
+}
+
+export default async function NewProtocolPage({ params }: PageProps) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  return (
+    <CmsPageShell account={account} title="Sitzungsprotokolle">
+      <MeetingsTabNavigation account={account} activeTab="protocols" />
+      <div className="space-y-4">
+        <div>
+          <h1 className="text-2xl font-bold">Neues Protokoll erstellen</h1>
+          <p className="text-muted-foreground">
+            Erstellen Sie ein neues Sitzungsprotokoll mit Tagesordnungspunkten.
+          </p>
+        </div>
+        <CreateProtocolForm accountId={acct.id} account={account} />
+      </div>
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/meetings/protocols/page.tsx b/apps/web/app/[locale]/home/[account]/meetings/protocols/page.tsx
new file mode 100644
index 000000000..7367ee3f3
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/meetings/protocols/page.tsx
@@ -0,0 +1,50 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createMeetingsApi } from '@kit/sitzungsprotokolle/api';
+import { MeetingsTabNavigation, ProtocolsDataTable } from '@kit/sitzungsprotokolle/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface PageProps {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function ProtocolsPage({ params, searchParams }: PageProps) {
+  const { account } = await params;
+  const sp = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createMeetingsApi(client);
+
+  const search = typeof sp.q === 'string' ? sp.q : undefined;
+  const meetingType = typeof sp.type === 'string' ? sp.type : undefined;
+  const page = typeof sp.page === 'string' ? parseInt(sp.page, 10) : 1;
+
+  const result = await api.listProtocols(acct.id, {
+    search,
+    meetingType,
+    page,
+  });
+
+  return (
+    <CmsPageShell account={account} title="Sitzungsprotokolle">
+      <MeetingsTabNavigation account={account} activeTab="protocols" />
+      <ProtocolsDataTable
+        data={result.data}
+        total={result.total}
+        page={result.page}
+        pageSize={result.pageSize}
+        account={account}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/meetings/tasks/page.tsx b/apps/web/app/[locale]/home/[account]/meetings/tasks/page.tsx
new file mode 100644
index 000000000..4f09d908e
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/meetings/tasks/page.tsx
@@ -0,0 +1,52 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createMeetingsApi } from '@kit/sitzungsprotokolle/api';
+import { MeetingsTabNavigation, OpenTasksView } from '@kit/sitzungsprotokolle/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface PageProps {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function TasksPage({ params, searchParams }: PageProps) {
+  const { account } = await params;
+  const sp = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createMeetingsApi(client);
+
+  const page = typeof sp.page === 'string' ? parseInt(sp.page, 10) : 1;
+
+  const result = await api.listOpenTasks(acct.id, { page });
+
+  return (
+    <CmsPageShell account={account} title="Sitzungsprotokolle">
+      <MeetingsTabNavigation account={account} activeTab="tasks" />
+      <div className="space-y-4">
+        <div>
+          <h1 className="text-2xl font-bold">Offene Aufgaben</h1>
+          <p className="text-muted-foreground">
+            Alle offenen und in Bearbeitung befindlichen Tagesordnungspunkte über alle Protokolle.
+          </p>
+        </div>
+        <OpenTasksView
+          data={result.data as any}
+          total={result.total}
+          page={result.page}
+          pageSize={result.pageSize}
+          account={account}
+        />
+      </div>
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/[memberId]/edit/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/[memberId]/edit/page.tsx
index c42fa41e8..b578f4e8b 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/[memberId]/edit/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/[memberId]/edit/page.tsx
@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createMemberManagementApi } from '@kit/member-management/api';
 import { EditMemberForm } from '@kit/member-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props {
   params: Promise<{ account: string; memberId: string }>;
@@ -11,7 +12,7 @@ export default async function EditMemberPage({ params }: Props) {
   const { account, memberId } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
   const member = await api.getMember(memberId);
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/[memberId]/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/[memberId]/page.tsx
index cf3fd9773..64024b816 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/[memberId]/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/[memberId]/page.tsx
@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createMemberManagementApi } from '@kit/member-management/api';
 import { MemberDetailView } from '@kit/member-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props {
   params: Promise<{ account: string; memberId: string }>;
@@ -11,7 +12,7 @@ export default async function MemberDetailPage({ params }: Props) {
   const { account, memberId } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
   const member = await api.getMember(memberId);
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/applications/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/applications/page.tsx
index 204b363f9..5df3db453 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/applications/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/applications/page.tsx
@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createMemberManagementApi } from '@kit/member-management/api';
 import { ApplicationWorkflow } from '@kit/member-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props {
   params: Promise<{ account: string }>;
@@ -11,7 +12,7 @@ export default async function ApplicationsPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
   const applications = await api.listApplications(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/cards/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/cards/page.tsx
index be6a8b1f8..98a2c8acf 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/cards/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/cards/page.tsx
@@ -1,11 +1,12 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createMemberManagementApi } from '@kit/member-management/api';
-import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
-import { Button } from '@kit/ui/button';
-import { Badge } from '@kit/ui/badge';
-import { CreditCard, Download } from 'lucide-react';
+import { CreditCard } from 'lucide-react';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
+
+/** All active members are fetched for the card overview. */
+const CARDS_PAGE_SIZE = 100;
 
 interface Props {
   params: Promise<{ account: string }>;
@@ -15,67 +16,31 @@ export default async function MemberCardsPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
-  const result = await api.listMembers(acct.id, { status: 'active', pageSize: 100 });
+  const result = await api.listMembers(acct.id, { status: 'active', pageSize: CARDS_PAGE_SIZE });
   const members = result.data;
 
   return (
     <CmsPageShell account={account} title="Mitgliedsausweise" description="Ausweise erstellen und verwalten">
-      <div className="space-y-6">
-        <div className="flex items-center justify-between">
-          <p className="text-sm text-muted-foreground">{members.length} aktive Mitglieder</p>
-          <Button disabled>
-            <Download className="mr-2 h-4 w-4" />
-            Alle Ausweise generieren (PDF)
-          </Button>
-        </div>
-
-        {members.length === 0 ? (
-          <EmptyState
-            icon={<CreditCard className="h-8 w-8" />}
-            title="Keine aktiven Mitglieder"
-            description="Erstellen Sie zuerst Mitglieder, um Ausweise zu generieren."
-            actionLabel="Mitglieder verwalten"
-            actionHref={`/home/${account}/members-cms`}
-          />
-        ) : (
-          <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
-            {members.map((m: Record<string, unknown>) => (
-              <Card key={String(m.id)}>
-                <CardContent className="p-4">
-                  <div className="flex items-center justify-between">
-                    <div>
-                      <p className="font-semibold">{String(m.last_name)}, {String(m.first_name)}</p>
-                      <p className="text-xs text-muted-foreground">Nr. {String(m.member_number ?? '—')}</p>
-                    </div>
-                    <Badge variant="default">Aktiv</Badge>
-                  </div>
-                  <div className="mt-3 flex gap-2">
-                    <Button size="sm" variant="outline" disabled>
-                      <CreditCard className="mr-1 h-3 w-3" />
-                      Ausweis
-                    </Button>
-                  </div>
-                </CardContent>
-              </Card>
-            ))}
-          </div>
-        )}
-
-        <Card>
-          <CardHeader>
-            <CardTitle>PDF-Generierung</CardTitle>
-          </CardHeader>
-          <CardContent>
-            <p className="text-sm text-muted-foreground">
-              Die PDF-Generierung erfordert die Installation von <code>@react-pdf/renderer</code>.
-              Nach der Installation können Mitgliedsausweise einzeln oder als Stapel erstellt werden.
-            </p>
-          </CardContent>
-        </Card>
-      </div>
+      {members.length === 0 ? (
+        <EmptyState
+          icon={<CreditCard className="h-8 w-8" />}
+          title="Keine aktiven Mitglieder"
+          description="Erstellen Sie zuerst Mitglieder, um Ausweise zu generieren."
+          actionLabel="Mitglieder verwalten"
+          actionHref={`/home/${account}/members-cms`}
+        />
+      ) : (
+        <EmptyState
+          icon={<CreditCard className="h-8 w-8" />}
+          title="Feature in Entwicklung"
+          description={`Die Ausweiserstellung für ${members.length} aktive Mitglieder wird derzeit entwickelt. Diese Funktion wird in einem kommenden Update verfügbar sein.`}
+          actionLabel="Mitglieder verwalten"
+          actionHref={`/home/${account}/members-cms`}
+        />
+      )}
     </CmsPageShell>
   );
 }
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/departments/create-department-dialog.tsx b/apps/web/app/[locale]/home/[account]/members-cms/departments/create-department-dialog.tsx
new file mode 100644
index 000000000..1f87a75e2
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/members-cms/departments/create-department-dialog.tsx
@@ -0,0 +1,103 @@
+'use client';
+
+import { useCallback, useState } from 'react';
+import { useAction } from 'next-safe-action/hooks';
+import { useRouter } from 'next/navigation';
+import { toast } from '@kit/ui/sonner';
+import { Button } from '@kit/ui/button';
+import { Input } from '@kit/ui/input';
+import { Label } from '@kit/ui/label';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@kit/ui/dialog';
+import { Plus } from 'lucide-react';
+
+import { createDepartment } from '@kit/member-management/actions/member-actions';
+
+interface CreateDepartmentDialogProps {
+  accountId: string;
+}
+
+export function CreateDepartmentDialog({ accountId }: CreateDepartmentDialogProps) {
+  const router = useRouter();
+  const [open, setOpen] = useState(false);
+  const [name, setName] = useState('');
+  const [description, setDescription] = useState('');
+
+  const { execute, isPending } = useAction(createDepartment, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success('Abteilung erstellt');
+        setOpen(false);
+        setName('');
+        setDescription('');
+        router.refresh();
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Erstellen der Abteilung');
+    },
+  });
+
+  const handleSubmit = useCallback(
+    (e: React.FormEvent) => {
+      e.preventDefault();
+      if (!name.trim()) return;
+      execute({ accountId, name: name.trim(), description: description.trim() || undefined });
+    },
+    [execute, accountId, name, description],
+  );
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger render={<Button size="sm" />}>
+        <Plus className="mr-1 h-4 w-4" />
+        Neue Abteilung
+      </DialogTrigger>
+      <DialogContent>
+        <form onSubmit={handleSubmit}>
+          <DialogHeader>
+            <DialogTitle>Neue Abteilung</DialogTitle>
+            <DialogDescription>
+              Erstellen Sie eine neue Abteilung oder Sparte für Ihren Verein.
+            </DialogDescription>
+          </DialogHeader>
+          <div className="mt-4 space-y-4">
+            <div className="space-y-2">
+              <Label htmlFor="dept-name">Name</Label>
+              <Input
+                id="dept-name"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                placeholder="z. B. Jugendabteilung"
+                required
+                minLength={1}
+                maxLength={128}
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="dept-description">Beschreibung (optional)</Label>
+              <Input
+                id="dept-description"
+                value={description}
+                onChange={(e) => setDescription(e.target.value)}
+                placeholder="Kurze Beschreibung"
+              />
+            </div>
+          </div>
+          <DialogFooter className="mt-4">
+            <Button type="submit" disabled={isPending || !name.trim()}>
+              {isPending ? 'Wird erstellt…' : 'Erstellen'}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/departments/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/departments/page.tsx
index 913baec8d..680099b86 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/departments/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/departments/page.tsx
@@ -1,11 +1,11 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createMemberManagementApi } from '@kit/member-management/api';
-import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
-import { Badge } from '@kit/ui/badge';
-import { Button } from '@kit/ui/button';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
 import { Users } from 'lucide-react';
+import { AccountNotFound } from '~/components/account-not-found';
+
+import { CreateDepartmentDialog } from './create-department-dialog';
 
 interface Props {
   params: Promise<{ account: string }>;
@@ -15,40 +15,45 @@ export default async function DepartmentsPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
   const departments = await api.listDepartments(acct.id);
 
   return (
     <CmsPageShell account={account} title="Abteilungen" description="Sparten und Abteilungen verwalten">
-      {departments.length === 0 ? (
-        <EmptyState
-          icon={<Users className="h-8 w-8" />}
-          title="Keine Abteilungen vorhanden"
-          description="Erstellen Sie Ihre erste Abteilung."
-          actionLabel="Neue Abteilung"
-        />
-      ) : (
-        <div className="rounded-md border">
-          <table className="w-full text-sm">
-            <thead>
-              <tr className="border-b bg-muted/50">
-                <th className="p-3 text-left font-medium">Name</th>
-                <th className="p-3 text-left font-medium">Beschreibung</th>
-              </tr>
-            </thead>
-            <tbody>
-              {departments.map((dept: Record<string, unknown>) => (
-                <tr key={String(dept.id)} className="border-b hover:bg-muted/30">
-                  <td className="p-3 font-medium">{String(dept.name)}</td>
-                  <td className="p-3 text-muted-foreground">{String(dept.description ?? '—')}</td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
+      <div className="space-y-4">
+        <div className="flex items-center justify-end">
+          <CreateDepartmentDialog accountId={acct.id} />
         </div>
-      )}
+
+        {departments.length === 0 ? (
+          <EmptyState
+            icon={<Users className="h-8 w-8" />}
+            title="Keine Abteilungen vorhanden"
+            description="Erstellen Sie Ihre erste Abteilung."
+          />
+        ) : (
+          <div className="rounded-md border">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="border-b bg-muted/50">
+                  <th className="p-3 text-left font-medium">Name</th>
+                  <th className="p-3 text-left font-medium">Beschreibung</th>
+                </tr>
+              </thead>
+              <tbody>
+                {departments.map((dept: Record<string, unknown>) => (
+                  <tr key={String(dept.id)} className="border-b hover:bg-muted/30">
+                    <td className="p-3 font-medium">{String(dept.name)}</td>
+                    <td className="p-3 text-muted-foreground">{String(dept.description ?? '—')}</td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </div>
     </CmsPageShell>
   );
 }
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/dues/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/dues/page.tsx
index ad11cb834..c15e3e17a 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/dues/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/dues/page.tsx
@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createMemberManagementApi } from '@kit/member-management/api';
 import { DuesCategoryManager } from '@kit/member-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props {
   params: Promise<{ account: string }>;
@@ -11,7 +12,7 @@ export default async function DuesPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
   const categories = await api.listDuesCategories(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/import/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/import/page.tsx
index 34fcd9c3f..e85081c9b 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/import/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/import/page.tsx
@@ -1,6 +1,7 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { MemberImportWizard } from '@kit/member-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props {
   params: Promise<{ account: string }>;
@@ -10,7 +11,7 @@ export default async function MemberImportPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
     <CmsPageShell account={account} title="Mitglieder importieren" description="CSV-Datei importieren">
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/new/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/new/page.tsx
index de6d0c137..000207477 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/new/page.tsx
@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createMemberManagementApi } from '@kit/member-management/api';
 import { CreateMemberForm } from '@kit/member-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -9,7 +10,7 @@ export default async function NewMemberPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
   const duesCategories = await api.listDuesCategories(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/page.tsx
index 30a1f7dfa..002fa463d 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/page.tsx
@@ -2,6 +2,9 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createMemberManagementApi } from '@kit/member-management/api';
 import { MembersDataTable } from '@kit/member-management/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+const PAGE_SIZE = 25;
 
 interface Props {
   params: Promise<{ account: string }>;
@@ -13,7 +16,7 @@ export default async function MembersPage({ params, searchParams }: Props) {
   const search = await searchParams;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
   const page = Number(search.page) || 1;
@@ -21,7 +24,7 @@ export default async function MembersPage({ params, searchParams }: Props) {
     search: search.q as string,
     status: search.status as string,
     page,
-    pageSize: 25,
+    pageSize: PAGE_SIZE,
   });
   const duesCategories = await api.listDuesCategories(acct.id);
 
@@ -31,7 +34,7 @@ export default async function MembersPage({ params, searchParams }: Props) {
         data={result.data}
         total={result.total}
         page={page}
-        pageSize={25}
+        pageSize={PAGE_SIZE}
         account={account}
         duesCategories={(duesCategories ?? []).map((c: Record<string, unknown>) => ({
           id: String(c.id), name: String(c.name),
diff --git a/apps/web/app/[locale]/home/[account]/members-cms/statistics/page.tsx b/apps/web/app/[locale]/home/[account]/members-cms/statistics/page.tsx
index 108e7af13..73eec3104 100644
--- a/apps/web/app/[locale]/home/[account]/members-cms/statistics/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/members-cms/statistics/page.tsx
@@ -8,6 +8,7 @@ import { createMemberManagementApi } from '@kit/member-management/api';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { StatsCard } from '~/components/stats-card';
 import { StatsBarChart, StatsPieChart } from '~/components/stats-charts';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -23,7 +24,7 @@ export default async function MemberStatisticsPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createMemberManagementApi(client);
   const stats = await api.getMemberStatistics(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/modules/_components/module-toggles.tsx b/apps/web/app/[locale]/home/[account]/modules/_components/module-toggles.tsx
new file mode 100644
index 000000000..cf377ea69
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/modules/_components/module-toggles.tsx
@@ -0,0 +1,110 @@
+'use client';
+
+import { useRouter } from 'next/navigation';
+import { useTransition } from 'react';
+
+import { Fish, FileSignature, Building2 } from 'lucide-react';
+import { toast } from '@kit/ui/sonner';
+
+import { Switch } from '@kit/ui/switch';
+
+import { toggleModuleAction } from '../_lib/server/toggle-module';
+
+interface ModuleDefinition {
+  key: string;
+  label: string;
+  description: string;
+  icon: React.ReactNode;
+}
+
+const AVAILABLE_MODULES: ModuleDefinition[] = [
+  {
+    key: 'fischerei',
+    label: 'Fischerei',
+    description:
+      'Gewässer, Fischarten, Besatz, Fangbücher und Wettbewerbe verwalten',
+    icon: <Fish className="h-5 w-5" />,
+  },
+  {
+    key: 'meetings',
+    label: 'Sitzungsprotokolle',
+    description:
+      'Sitzungsprotokolle, Tagesordnungspunkte und Beschlüsse verwalten',
+    icon: <FileSignature className="h-5 w-5" />,
+  },
+  {
+    key: 'verband',
+    label: 'Verbandsverwaltung',
+    description:
+      'Mitgliedsvereine, Kontaktpersonen, Beiträge und Statistiken verwalten',
+    icon: <Building2 className="h-5 w-5" />,
+  },
+];
+
+interface ModuleTogglesProps {
+  accountId: string;
+  features: Record<string, boolean>;
+}
+
+export function ModuleToggles({ accountId, features }: ModuleTogglesProps) {
+  const router = useRouter();
+  const [isPending, startTransition] = useTransition();
+
+  const handleToggle = (moduleKey: string, enabled: boolean) => {
+    startTransition(async () => {
+      const result = await toggleModuleAction(accountId, moduleKey, enabled);
+
+      if (result.success) {
+        toast.success(
+          enabled ? 'Modul aktiviert' : 'Modul deaktiviert',
+        );
+
+        router.refresh();
+      } else {
+        toast.error('Fehler beim Aktualisieren des Moduls');
+      }
+    });
+  };
+
+  return (
+    <div className="flex flex-col gap-4">
+      <div>
+        <h2 className="text-xl font-semibold">Verfügbare Module</h2>
+        <p className="text-muted-foreground text-sm">
+          Aktivieren oder deaktivieren Sie Module für Ihren Verein
+        </p>
+      </div>
+
+      <div className="divide-y rounded-lg border">
+        {AVAILABLE_MODULES.map((mod) => {
+          const isEnabled = features[mod.key] === true;
+
+          return (
+            <div
+              key={mod.key}
+              className="flex items-center justify-between gap-4 p-4"
+            >
+              <div className="flex items-center gap-3">
+                <div className="text-muted-foreground">{mod.icon}</div>
+                <div>
+                  <p className="font-medium">{mod.label}</p>
+                  <p className="text-muted-foreground text-sm">
+                    {mod.description}
+                  </p>
+                </div>
+              </div>
+
+              <Switch
+                checked={isEnabled}
+                onCheckedChange={(checked) =>
+                  handleToggle(mod.key, Boolean(checked))
+                }
+                disabled={isPending}
+              />
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/modules/_lib/server/toggle-module.ts b/apps/web/app/[locale]/home/[account]/modules/_lib/server/toggle-module.ts
new file mode 100644
index 000000000..27baa931c
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/modules/_lib/server/toggle-module.ts
@@ -0,0 +1,40 @@
+'use server';
+
+import { revalidatePath } from 'next/cache';
+
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+
+export async function toggleModuleAction(
+  accountId: string,
+  moduleKey: string,
+  enabled: boolean,
+) {
+  const client = getSupabaseServerClient();
+
+  // Read current features
+  const { data: settings } = await client
+    .from('account_settings')
+    .select('features')
+    .eq('account_id', accountId)
+    .maybeSingle();
+
+  const currentFeatures =
+    (settings?.features as Record<string, boolean>) ?? {};
+  const newFeatures = { ...currentFeatures, [moduleKey]: enabled };
+
+  // Upsert
+  const { error } = await client.from('account_settings').upsert(
+    {
+      account_id: accountId,
+      features: newFeatures,
+    },
+    { onConflict: 'account_id' },
+  );
+
+  if (error) {
+    return { success: false, error: error.message };
+  }
+
+  revalidatePath(`/home`, 'layout');
+  return { success: true };
+}
diff --git a/apps/web/app/[locale]/home/[account]/modules/page.tsx b/apps/web/app/[locale]/home/[account]/modules/page.tsx
index a7e7cb46f..5c904252c 100644
--- a/apps/web/app/[locale]/home/[account]/modules/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/modules/page.tsx
@@ -1,7 +1,14 @@
+import Link from 'next/link';
+
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { createModuleBuilderApi } from '@kit/module-builder/api';
 
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+import { ModuleToggles } from './_components/module-toggles';
+
 interface ModulesPageProps {
   params: Promise<{ account: string }>;
 }
@@ -19,48 +26,59 @@ export default async function ModulesPage({ params }: ModulesPageProps) {
     .single();
 
   if (!accountData) {
-    return <div>Account not found</div>;
+    return <AccountNotFound />;
   }
 
+  // Load account features
+  const { data: settings } = await client
+    .from('account_settings')
+    .select('features')
+    .eq('account_id', accountData.id)
+    .maybeSingle();
+
+  const features = (settings?.features as Record<string, boolean>) ?? {};
+
   const modules = await api.modules.listModules(accountData.id);
 
   return (
-    <div className="flex flex-col gap-4">
-      <div className="flex items-center justify-between">
-        <div>
-          <h1 className="text-2xl font-bold">Module</h1>
-          <p className="text-muted-foreground">
-            Verwalten Sie Ihre Datenmodule
-          </p>
-        </div>
-      </div>
+    <CmsPageShell
+      account={account}
+      title="Module"
+      description="Verwalten Sie Ihre Datenmodule"
+    >
+      <div className="flex flex-col gap-8">
+        <ModuleToggles accountId={accountData.id} features={features} />
 
-      {modules.length === 0 ? (
-        <div className="flex flex-col items-center justify-center py-12 text-center">
-          <p className="text-muted-foreground">
-            Noch keine Module vorhanden. Erstellen Sie Ihr erstes Modul.
-          </p>
-        </div>
-      ) : (
-        <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
-          {modules.map((module: Record<string, unknown>) => (
-            <div
-              key={module.id as string}
-              className="rounded-lg border p-4 hover:bg-accent/50 transition-colors"
-            >
-              <h3 className="font-semibold">{String(module.display_name)}</h3>
-              {module.description ? (
-                <p className="text-sm text-muted-foreground mt-1">
-                  {String(module.description)}
-                </p>
-              ) : null}
-              <div className="mt-2 text-xs text-muted-foreground">
-                Status: {String(module.status)}
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
+        {modules.length === 0 ? (
+          <div className="flex flex-col items-center justify-center py-12 text-center">
+            <p className="text-muted-foreground">
+              Noch keine Module vorhanden. Erstellen Sie Ihr erstes Modul.
+            </p>
+          </div>
+        ) : (
+          <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
+            {modules.map((module: Record<string, unknown>) => (
+              <Link
+                key={module.id as string}
+                href={`/home/${account}/modules/${module.id as string}`}
+                className="block rounded-lg border p-4 hover:bg-accent/50 transition-colors"
+              >
+                <h3 className="font-semibold">
+                  {String(module.display_name)}
+                </h3>
+                {module.description ? (
+                  <p className="text-sm text-muted-foreground mt-1">
+                    {String(module.description)}
+                  </p>
+                ) : null}
+                <div className="mt-2 text-xs text-muted-foreground">
+                  Status: {String(module.status)}
+                </div>
+              </Link>
+            ))}
+          </div>
+        )}
+      </div>
+    </CmsPageShell>
   );
 }
diff --git a/apps/web/app/[locale]/home/[account]/newsletter/[campaignId]/page.tsx b/apps/web/app/[locale]/home/[account]/newsletter/[campaignId]/page.tsx
index a3b151d7b..1c1638222 100644
--- a/apps/web/app/[locale]/home/[account]/newsletter/[campaignId]/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/newsletter/[campaignId]/page.tsx
@@ -11,47 +11,18 @@ import { createNewsletterApi } from '@kit/newsletter/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
+import {
+  NEWSLETTER_STATUS_VARIANT,
+  NEWSLETTER_STATUS_LABEL,
+  NEWSLETTER_RECIPIENT_STATUS_VARIANT,
+  NEWSLETTER_RECIPIENT_STATUS_LABEL,
+} from '~/lib/status-badges';
 
 interface PageProps {
   params: Promise<{ account: string; campaignId: string }>;
 }
 
-const STATUS_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  draft: 'secondary',
-  scheduled: 'default',
-  sending: 'info',
-  sent: 'outline',
-  failed: 'destructive',
-};
-
-const STATUS_LABEL: Record<string, string> = {
-  draft: 'Entwurf',
-  scheduled: 'Geplant',
-  sending: 'Wird gesendet',
-  sent: 'Gesendet',
-  failed: 'Fehlgeschlagen',
-};
-
-const RECIPIENT_STATUS_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  pending: 'secondary',
-  sent: 'default',
-  failed: 'destructive',
-  bounced: 'destructive',
-};
-
-const RECIPIENT_STATUS_LABEL: Record<string, string> = {
-  pending: 'Ausstehend',
-  sent: 'Gesendet',
-  failed: 'Fehlgeschlagen',
-  bounced: 'Zurückgewiesen',
-};
-
 export default async function NewsletterDetailPage({ params }: PageProps) {
   const { account, campaignId } = await params;
   const client = getSupabaseServerClient();
@@ -62,7 +33,7 @@ export default async function NewsletterDetailPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createNewsletterApi(client);
 
@@ -102,8 +73,8 @@ export default async function NewsletterDetailPage({ params }: PageProps) {
             <CardTitle>
               {String(newsletter.subject ?? '(Kein Betreff)')}
             </CardTitle>
-            <Badge variant={STATUS_VARIANT[status] ?? 'secondary'}>
-              {STATUS_LABEL[status] ?? status}
+            <Badge variant={NEWSLETTER_STATUS_VARIANT[status] ?? 'secondary'}>
+              {NEWSLETTER_STATUS_LABEL[status] ?? status}
             </Badge>
           </CardHeader>
           <CardContent>
@@ -175,10 +146,10 @@ export default async function NewsletterDetailPage({ params }: PageProps) {
                           <td className="p-3">
                             <Badge
                               variant={
-                                RECIPIENT_STATUS_VARIANT[rStatus] ?? 'secondary'
+                                NEWSLETTER_RECIPIENT_STATUS_VARIANT[rStatus] ?? 'secondary'
                               }
                             >
-                              {RECIPIENT_STATUS_LABEL[rStatus] ?? rStatus}
+                              {NEWSLETTER_RECIPIENT_STATUS_LABEL[rStatus] ?? rStatus}
                             </Badge>
                           </td>
                         </tr>
diff --git a/apps/web/app/[locale]/home/[account]/newsletter/new/page.tsx b/apps/web/app/[locale]/home/[account]/newsletter/new/page.tsx
index 95d173f37..6a3fbc68d 100644
--- a/apps/web/app/[locale]/home/[account]/newsletter/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/newsletter/new/page.tsx
@@ -1,6 +1,7 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { CreateNewsletterForm } from '@kit/newsletter/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -8,7 +9,7 @@ export default async function NewNewsletterPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
     <CmsPageShell account={account} title="Neuer Newsletter" description="Newsletter-Kampagne erstellen">
diff --git a/apps/web/app/[locale]/home/[account]/newsletter/page.tsx b/apps/web/app/[locale]/home/[account]/newsletter/page.tsx
index 1971dbc9c..1402c9c25 100644
--- a/apps/web/app/[locale]/home/[account]/newsletter/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/newsletter/page.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-import { Mail, Plus, Send, Users } from 'lucide-react';
+import { ChevronLeft, ChevronRight, Mail, Plus, Send, Users } from 'lucide-react';
 
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Badge } from '@kit/ui/badge';
@@ -12,32 +12,22 @@ import { createNewsletterApi } from '@kit/newsletter/api';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
+import {
+  NEWSLETTER_STATUS_VARIANT,
+  NEWSLETTER_STATUS_LABEL,
+} from '~/lib/status-badges';
+
+const PAGE_SIZE = 25;
 
 interface PageProps {
   params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
 }
 
-const STATUS_BADGE_VARIANT: Record<
-  string,
-  'secondary' | 'default' | 'info' | 'outline' | 'destructive'
-> = {
-  draft: 'secondary',
-  scheduled: 'default',
-  sending: 'info',
-  sent: 'outline',
-  failed: 'destructive',
-};
-
-const STATUS_LABEL: Record<string, string> = {
-  draft: 'Entwurf',
-  scheduled: 'Geplant',
-  sending: 'Wird gesendet',
-  sent: 'Gesendet',
-  failed: 'Fehlgeschlagen',
-};
-
-export default async function NewsletterPage({ params }: PageProps) {
+export default async function NewsletterPage({ params, searchParams }: PageProps) {
   const { account } = await params;
+  const search = await searchParams;
   const client = getSupabaseServerClient();
 
   const { data: acct } = await client
@@ -46,21 +36,29 @@ export default async function NewsletterPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createNewsletterApi(client);
-  const newsletters = await api.listNewsletters(acct.id);
+  const allNewsletters = await api.listNewsletters(acct.id);
 
-  const sentCount = newsletters.filter(
+  const sentCount = allNewsletters.filter(
     (n: Record<string, unknown>) => n.status === 'sent',
   ).length;
 
-  const totalRecipients = newsletters.reduce(
+  const totalRecipients = allNewsletters.reduce(
     (sum: number, n: Record<string, unknown>) =>
       sum + (Number(n.total_recipients) || 0),
     0,
   );
 
+  // Pagination
+  const currentPage = Math.max(1, Number(search.page) || 1);
+  const totalItems = allNewsletters.length;
+  const totalPages = Math.max(1, Math.ceil(totalItems / PAGE_SIZE));
+  const safePage = Math.min(currentPage, totalPages);
+  const startIdx = (safePage - 1) * PAGE_SIZE;
+  const newsletters = allNewsletters.slice(startIdx, startIdx + PAGE_SIZE);
+
   return (
     <CmsPageShell account={account} title="Newsletter">
       <div className="flex w-full flex-col gap-6">
@@ -85,7 +83,7 @@ export default async function NewsletterPage({ params }: PageProps) {
         <div className="grid grid-cols-1 gap-4 sm:grid-cols-3">
           <StatsCard
             title="Newsletter"
-            value={newsletters.length}
+            value={totalItems}
             icon={<Mail className="h-5 w-5" />}
           />
           <StatsCard
@@ -101,7 +99,7 @@ export default async function NewsletterPage({ params }: PageProps) {
         </div>
 
         {/* Table or Empty State */}
-        {newsletters.length === 0 ? (
+        {totalItems === 0 ? (
           <EmptyState
             icon={<Mail className="h-8 w-8" />}
             title="Keine Newsletter vorhanden"
@@ -112,7 +110,7 @@ export default async function NewsletterPage({ params }: PageProps) {
         ) : (
           <Card>
             <CardHeader>
-              <CardTitle>Alle Newsletter ({newsletters.length})</CardTitle>
+              <CardTitle>Alle Newsletter ({totalItems})</CardTitle>
             </CardHeader>
             <CardContent>
               <div className="rounded-md border">
@@ -143,10 +141,10 @@ export default async function NewsletterPage({ params }: PageProps) {
                         <td className="p-3">
                           <Badge
                             variant={
-                              STATUS_BADGE_VARIANT[String(nl.status)] ?? 'secondary'
+                              NEWSLETTER_STATUS_VARIANT[String(nl.status)] ?? 'secondary'
                             }
                           >
-                            {STATUS_LABEL[String(nl.status)] ?? String(nl.status)}
+                            {NEWSLETTER_STATUS_LABEL[String(nl.status)] ?? String(nl.status)}
                           </Badge>
                         </td>
                         <td className="p-3 text-right">
@@ -169,6 +167,44 @@ export default async function NewsletterPage({ params }: PageProps) {
                   </tbody>
                 </table>
               </div>
+
+              {/* Pagination */}
+              {totalPages > 1 && (
+                <div className="flex items-center justify-between pt-4">
+                  <p className="text-sm text-muted-foreground">
+                    {startIdx + 1}–{Math.min(startIdx + PAGE_SIZE, totalItems)} von {totalItems}
+                  </p>
+                  <div className="flex items-center gap-1">
+                    {safePage > 1 ? (
+                      <Link href={`/home/${account}/newsletter?page=${safePage - 1}`}>
+                        <Button variant="outline" size="sm">
+                          <ChevronLeft className="h-4 w-4" />
+                        </Button>
+                      </Link>
+                    ) : (
+                      <Button variant="outline" size="sm" disabled>
+                        <ChevronLeft className="h-4 w-4" />
+                      </Button>
+                    )}
+
+                    <span className="px-3 text-sm font-medium">
+                      {safePage} / {totalPages}
+                    </span>
+
+                    {safePage < totalPages ? (
+                      <Link href={`/home/${account}/newsletter?page=${safePage + 1}`}>
+                        <Button variant="outline" size="sm">
+                          <ChevronRight className="h-4 w-4" />
+                        </Button>
+                      </Link>
+                    ) : (
+                      <Button variant="outline" size="sm" disabled>
+                        <ChevronRight className="h-4 w-4" />
+                      </Button>
+                    )}
+                  </div>
+                </div>
+              )}
             </CardContent>
           </Card>
         )}
diff --git a/apps/web/app/[locale]/home/[account]/newsletter/templates/page.tsx b/apps/web/app/[locale]/home/[account]/newsletter/templates/page.tsx
index 795cf534b..6b972b014 100644
--- a/apps/web/app/[locale]/home/[account]/newsletter/templates/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/newsletter/templates/page.tsx
@@ -11,6 +11,7 @@ import { createNewsletterApi } from '@kit/newsletter/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface PageProps {
   params: Promise<{ account: string }>;
@@ -26,7 +27,7 @@ export default async function NewsletterTemplatesPage({ params }: PageProps) {
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createNewsletterApi(client);
   const templates = await api.listTemplates(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/page.tsx b/apps/web/app/[locale]/home/[account]/page.tsx
index 6f8f33b54..a4b7811e9 100644
--- a/apps/web/app/[locale]/home/[account]/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/page.tsx
@@ -15,7 +15,7 @@ import {
 
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { Badge } from '@kit/ui/badge';
-import { Button } from '@kit/ui/button';
+
 import {
   Card,
   CardContent,
@@ -32,7 +32,9 @@ import { createBookingManagementApi } from '@kit/booking-management/api';
 import { createEventManagementApi } from '@kit/event-management/api';
 
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { EmptyState } from '~/components/empty-state';
 import { StatsCard } from '~/components/stats-card';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface TeamAccountHomePageProps {
   params: Promise<{ account: string }>;
@@ -50,7 +52,7 @@ export default async function TeamAccountHomePage({
     .eq('slug', account)
     .single();
 
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   // Load all stats in parallel with allSettled for resilience
   const [
@@ -157,7 +159,15 @@ export default async function TeamAccountHomePage({
                           href={`/home/${account}/bookings/${String(booking.id)}`}
                           className="text-sm font-medium hover:underline"
                         >
-                          Buchung #{String(booking.id).slice(0, 8)}
+                          Buchung{' '}
+                          {booking.check_in
+                            ? new Date(
+                                String(booking.check_in),
+                              ).toLocaleDateString('de-DE', {
+                                day: '2-digit',
+                                month: 'short',
+                              })
+                            : '—'}
                         </Link>
                         <p className="text-xs text-muted-foreground">
                           {booking.check_in
@@ -213,12 +223,11 @@ export default async function TeamAccountHomePage({
                 ))}
 
                 {bookings.data.length === 0 && events.data.length === 0 && (
-                  <div className="flex flex-col items-center justify-center py-8 text-center">
-                    <Activity className="h-8 w-8 text-muted-foreground/50" />
-                    <p className="mt-2 text-sm text-muted-foreground">
-                      Noch keine Aktivitäten vorhanden
-                    </p>
-                  </div>
+                  <EmptyState
+                    icon={<Activity className="h-8 w-8" />}
+                    title="Noch keine Aktivitäten"
+                    description="Aktuelle Buchungen und Veranstaltungen werden hier angezeigt."
+                  />
                 )}
               </div>
             </CardContent>
@@ -231,69 +240,59 @@ export default async function TeamAccountHomePage({
               <CardDescription>Häufig verwendete Aktionen</CardDescription>
             </CardHeader>
             <CardContent className="flex flex-col gap-2">
-              <Link href={`/home/${account}/members-cms/new`}>
-                <Button
-                  variant="outline"
-                  className="w-full justify-between"
-                >
-                  <span className="flex items-center gap-2">
-                    <UserPlus className="h-4 w-4" />
-                    Neues Mitglied
-                  </span>
-                  <ArrowRight className="h-4 w-4" />
-                </Button>
+              <Link
+                href={`/home/${account}/members-cms/new`}
+                className="inline-flex w-full items-center justify-between gap-2 rounded-lg border border-border bg-background px-4 py-2 text-sm font-medium hover:bg-muted hover:text-foreground transition-all"
+              >
+                <span className="flex items-center gap-2">
+                  <UserPlus className="h-4 w-4" />
+                  Neues Mitglied
+                </span>
+                <ArrowRight className="h-4 w-4" />
               </Link>
 
-              <Link href={`/home/${account}/courses/new`}>
-                <Button
-                  variant="outline"
-                  className="w-full justify-between"
-                >
-                  <span className="flex items-center gap-2">
-                    <GraduationCap className="h-4 w-4" />
-                    Neuer Kurs
-                  </span>
-                  <ArrowRight className="h-4 w-4" />
-                </Button>
+              <Link
+                href={`/home/${account}/courses/new`}
+                className="inline-flex w-full items-center justify-between gap-2 rounded-lg border border-border bg-background px-4 py-2 text-sm font-medium hover:bg-muted hover:text-foreground transition-all"
+              >
+                <span className="flex items-center gap-2">
+                  <GraduationCap className="h-4 w-4" />
+                  Neuer Kurs
+                </span>
+                <ArrowRight className="h-4 w-4" />
               </Link>
 
-              <Link href={`/home/${account}/newsletter/new`}>
-                <Button
-                  variant="outline"
-                  className="w-full justify-between"
-                >
-                  <span className="flex items-center gap-2">
-                    <Mail className="h-4 w-4" />
-                    Newsletter erstellen
-                  </span>
-                  <ArrowRight className="h-4 w-4" />
-                </Button>
+              <Link
+                href={`/home/${account}/newsletter/new`}
+                className="inline-flex w-full items-center justify-between gap-2 rounded-lg border border-border bg-background px-4 py-2 text-sm font-medium hover:bg-muted hover:text-foreground transition-all"
+              >
+                <span className="flex items-center gap-2">
+                  <Mail className="h-4 w-4" />
+                  Newsletter erstellen
+                </span>
+                <ArrowRight className="h-4 w-4" />
               </Link>
 
-              <Link href={`/home/${account}/bookings/new`}>
-                <Button
-                  variant="outline"
-                  className="w-full justify-between"
-                >
-                  <span className="flex items-center gap-2">
-                    <BedDouble className="h-4 w-4" />
-                    Neue Buchung
-                  </span>
-                  <ArrowRight className="h-4 w-4" />
-                </Button>
+              <Link
+                href={`/home/${account}/bookings/new`}
+                className="inline-flex w-full items-center justify-between gap-2 rounded-lg border border-border bg-background px-4 py-2 text-sm font-medium hover:bg-muted hover:text-foreground transition-all"
+              >
+                <span className="flex items-center gap-2">
+                  <BedDouble className="h-4 w-4" />
+                  Neue Buchung
+                </span>
+                <ArrowRight className="h-4 w-4" />
               </Link>
 
-              <Link href={`/home/${account}/events/new`}>
-                <Button
-                  variant="outline"
-                  className="w-full justify-between"
-                >
-                  <span className="flex items-center gap-2">
-                    <Plus className="h-4 w-4" />
-                    Neue Veranstaltung
-                  </span>
-                  <ArrowRight className="h-4 w-4" />
-                </Button>
+              <Link
+                href={`/home/${account}/events/new`}
+                className="inline-flex w-full items-center justify-between gap-2 rounded-lg border border-border bg-background px-4 py-2 text-sm font-medium hover:bg-muted hover:text-foreground transition-all"
+              >
+                <span className="flex items-center gap-2">
+                  <Plus className="h-4 w-4" />
+                  Neue Veranstaltung
+                </span>
+                <ArrowRight className="h-4 w-4" />
               </Link>
             </CardContent>
           </Card>
@@ -317,10 +316,11 @@ export default async function TeamAccountHomePage({
                     aktiv
                   </p>
                 </div>
-                <Link href={`/home/${account}/bookings`}>
-                  <Button variant="ghost" size="icon">
-                    <ArrowRight className="h-4 w-4" />
-                  </Button>
+                <Link
+                  href={`/home/${account}/bookings`}
+                  className="inline-flex h-9 w-9 items-center justify-center rounded-lg text-sm font-medium hover:bg-muted hover:text-foreground transition-all"
+                >
+                  <ArrowRight className="h-4 w-4" />
                 </Link>
               </div>
             </CardContent>
@@ -343,10 +343,11 @@ export default async function TeamAccountHomePage({
                     aktiv
                   </p>
                 </div>
-                <Link href={`/home/${account}/events`}>
-                  <Button variant="ghost" size="icon">
-                    <ArrowRight className="h-4 w-4" />
-                  </Button>
+                <Link
+                  href={`/home/${account}/events`}
+                  className="inline-flex h-9 w-9 items-center justify-center rounded-lg text-sm font-medium hover:bg-muted hover:text-foreground transition-all"
+                >
+                  <ArrowRight className="h-4 w-4" />
                 </Link>
               </div>
             </CardContent>
@@ -366,10 +367,11 @@ export default async function TeamAccountHomePage({
                     von {courseStats.totalCourses} insgesamt
                   </p>
                 </div>
-                <Link href={`/home/${account}/courses`}>
-                  <Button variant="ghost" size="icon">
-                    <ArrowRight className="h-4 w-4" />
-                  </Button>
+                <Link
+                  href={`/home/${account}/courses`}
+                  className="inline-flex h-9 w-9 items-center justify-center rounded-lg text-sm font-medium hover:bg-muted hover:text-foreground transition-all"
+                >
+                  <ArrowRight className="h-4 w-4" />
                 </Link>
               </div>
             </CardContent>
diff --git a/apps/web/app/[locale]/home/[account]/site-builder/[pageId]/edit/page.tsx b/apps/web/app/[locale]/home/[account]/site-builder/[pageId]/edit/page.tsx
index c98d475bc..21531cb51 100644
--- a/apps/web/app/[locale]/home/[account]/site-builder/[pageId]/edit/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/site-builder/[pageId]/edit/page.tsx
@@ -1,6 +1,7 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createSiteBuilderApi } from '@kit/site-builder/api';
 import { SiteEditor } from '@kit/site-builder/components';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string; pageId: string }> }
 
@@ -8,7 +9,7 @@ export default async function EditPageRoute({ params }: Props) {
   const { account, pageId } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createSiteBuilderApi(client);
   const page = await api.getPage(pageId);
diff --git a/apps/web/app/[locale]/home/[account]/site-builder/new/page.tsx b/apps/web/app/[locale]/home/[account]/site-builder/new/page.tsx
index f0e461218..1b9be7ef1 100644
--- a/apps/web/app/[locale]/home/[account]/site-builder/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/site-builder/new/page.tsx
@@ -1,6 +1,7 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { CreatePageForm } from '@kit/site-builder/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props {
   params: Promise<{ account: string }>;
@@ -10,7 +11,7 @@ export default async function NewSitePage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
     <CmsPageShell account={account} title="Neue Seite" description="Seite für Ihre Vereinswebsite erstellen">
diff --git a/apps/web/app/[locale]/home/[account]/site-builder/page.tsx b/apps/web/app/[locale]/home/[account]/site-builder/page.tsx
index f66000f60..f2bb35647 100644
--- a/apps/web/app/[locale]/home/[account]/site-builder/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/site-builder/page.tsx
@@ -3,10 +3,12 @@ import { createSiteBuilderApi } from '@kit/site-builder/api';
 import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
 import { Badge } from '@kit/ui/badge';
 import { Button } from '@kit/ui/button';
+import { cn } from '@kit/ui/utils';
 import { Plus, Globe, FileText, Settings, ExternalLink } from 'lucide-react';
 import Link from 'next/link';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -14,14 +16,15 @@ export default async function SiteBuilderDashboard({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createSiteBuilderApi(client);
   const pages = await api.listPages(acct.id);
   const settings = await api.getSiteSettings(acct.id);
   const posts = await api.listPosts(acct.id);
 
-  const publishedCount = pages.filter((p: any) => p.is_published).length;
+  const isOnline = Boolean(settings?.is_public);
+  const publishedCount = pages.filter((p: Record<string, unknown>) => p.is_published).length;
 
   return (
     <CmsPageShell account={account} title="Website-Baukasten" description="Ihre Vereinswebseite verwalten">
@@ -34,7 +37,7 @@ export default async function SiteBuilderDashboard({ params }: Props) {
             <Link href={`/home/${account}/site-builder/posts`}>
               <Button variant="outline" size="sm"><FileText className="mr-2 h-4 w-4" />Beiträge ({posts.length})</Button>
             </Link>
-            {settings?.is_public && (
+            {isOnline && (
               <a href={`/club/${account}`} target="_blank" rel="noopener">
                 <Button variant="outline" size="sm"><ExternalLink className="mr-2 h-4 w-4" />Website ansehen</Button>
               </a>
@@ -48,7 +51,17 @@ export default async function SiteBuilderDashboard({ params }: Props) {
         <div className="grid grid-cols-1 gap-4 sm:grid-cols-3">
           <Card><CardContent className="p-6"><p className="text-sm text-muted-foreground">Seiten</p><p className="text-2xl font-bold">{pages.length}</p></CardContent></Card>
           <Card><CardContent className="p-6"><p className="text-sm text-muted-foreground">Veröffentlicht</p><p className="text-2xl font-bold">{publishedCount}</p></CardContent></Card>
-          <Card><CardContent className="p-6"><p className="text-sm text-muted-foreground">Status</p><p className="text-2xl font-bold">{settings?.is_public ? '🟢 Online' : '🔴 Offline'}</p></CardContent></Card>
+          <Card>
+            <CardContent className="p-6">
+              <p className="text-sm text-muted-foreground">Status</p>
+              <p className="text-2xl font-bold">
+                <span className="flex items-center gap-1.5">
+                  <span className={cn('inline-block h-2 w-2 rounded-full', isOnline ? 'bg-green-500' : 'bg-red-500')} />
+                  <span>{isOnline ? 'Online' : 'Offline'}</span>
+                </span>
+              </p>
+            </CardContent>
+          </Card>
         </div>
 
         {pages.length === 0 ? (
diff --git a/apps/web/app/[locale]/home/[account]/site-builder/posts/new/page.tsx b/apps/web/app/[locale]/home/[account]/site-builder/posts/new/page.tsx
index dd3a026b5..5023fc263 100644
--- a/apps/web/app/[locale]/home/[account]/site-builder/posts/new/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/site-builder/posts/new/page.tsx
@@ -1,6 +1,7 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { CreatePostForm } from '@kit/site-builder/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -8,7 +9,7 @@ export default async function NewPostPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   return (
     <CmsPageShell account={account} title="Neuer Beitrag" description="Beitrag erstellen">
diff --git a/apps/web/app/[locale]/home/[account]/site-builder/posts/page.tsx b/apps/web/app/[locale]/home/[account]/site-builder/posts/page.tsx
index ee139418e..ce8a1d7b5 100644
--- a/apps/web/app/[locale]/home/[account]/site-builder/posts/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/site-builder/posts/page.tsx
@@ -7,6 +7,7 @@ import { Plus } from 'lucide-react';
 import Link from 'next/link';
 import { CmsPageShell } from '~/components/cms-page-shell';
 import { EmptyState } from '~/components/empty-state';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -14,7 +15,7 @@ export default async function PostsManagerPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createSiteBuilderApi(client);
   const posts = await api.listPosts(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/site-builder/settings/page.tsx b/apps/web/app/[locale]/home/[account]/site-builder/settings/page.tsx
index c2a8da79d..4aafda5f6 100644
--- a/apps/web/app/[locale]/home/[account]/site-builder/settings/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/site-builder/settings/page.tsx
@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createSiteBuilderApi } from '@kit/site-builder/api';
 import { SiteSettingsForm } from '@kit/site-builder/components';
 import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
 
 interface Props { params: Promise<{ account: string }> }
 
@@ -9,7 +10,7 @@ export default async function SiteSettingsPage({ params }: Props) {
   const { account } = await params;
   const client = getSupabaseServerClient();
   const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single();
-  if (!acct) return <div>Konto nicht gefunden</div>;
+  if (!acct) return <AccountNotFound />;
 
   const api = createSiteBuilderApi(client);
   const settings = await api.getSiteSettings(acct.id);
diff --git a/apps/web/app/[locale]/home/[account]/verband/clubs/[clubId]/page.tsx b/apps/web/app/[locale]/home/[account]/verband/clubs/[clubId]/page.tsx
new file mode 100644
index 000000000..659f0466f
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/clubs/[clubId]/page.tsx
@@ -0,0 +1,69 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createVerbandApi } from '@kit/verbandsverwaltung/api';
+import {
+  VerbandTabNavigation,
+  ClubContactsManager,
+  ClubFeeBillingTable,
+  ClubNotesList,
+} from '@kit/verbandsverwaltung/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string; clubId: string }>;
+}
+
+export default async function ClubDetailPage({ params }: Props) {
+  const { account, clubId } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createVerbandApi(client);
+  const detail = await api.getClubDetail(clubId);
+
+  return (
+    <CmsPageShell account={account} title={`Verein – ${detail.club.name}`}>
+      <VerbandTabNavigation account={account} activeTab="clubs" />
+
+      <div className="space-y-6">
+        {/* Club Header */}
+        <div className="flex items-start justify-between">
+          <div>
+            <h1 className="text-2xl font-bold">{detail.club.name}</h1>
+            {detail.club.short_name && (
+              <p className="text-muted-foreground">{detail.club.short_name}</p>
+            )}
+            <div className="mt-2 flex flex-wrap gap-4 text-sm text-muted-foreground">
+              {detail.club.city && (
+                <span>{detail.club.zip} {detail.club.city}</span>
+              )}
+              {detail.club.member_count != null && (
+                <span>{detail.club.member_count} Mitglieder</span>
+              )}
+              {detail.club.founded_year && (
+                <span>Gegr. {detail.club.founded_year}</span>
+              )}
+            </div>
+          </div>
+        </div>
+
+        {/* Contacts */}
+        <ClubContactsManager clubId={clubId} contacts={detail.contacts} />
+
+        {/* Fee Billings */}
+        <ClubFeeBillingTable billings={detail.billings} clubId={clubId} />
+
+        {/* Notes */}
+        <ClubNotesList notes={detail.notes} clubId={clubId} />
+      </div>
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/verband/clubs/new/page.tsx b/apps/web/app/[locale]/home/[account]/verband/clubs/new/page.tsx
new file mode 100644
index 000000000..e71f7ae15
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/clubs/new/page.tsx
@@ -0,0 +1,37 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createVerbandApi } from '@kit/verbandsverwaltung/api';
+import { VerbandTabNavigation, CreateClubForm } from '@kit/verbandsverwaltung/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+}
+
+export default async function NewClubPage({ params }: Props) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createVerbandApi(client);
+  const types = await api.listTypes(acct.id);
+
+  return (
+    <CmsPageShell account={account} title="Neuer Verein">
+      <VerbandTabNavigation account={account} activeTab="clubs" />
+      <CreateClubForm
+        accountId={acct.id}
+        account={account}
+        types={types.map((t) => ({ id: t.id, name: t.name }))}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/verband/clubs/page.tsx b/apps/web/app/[locale]/home/[account]/verband/clubs/page.tsx
new file mode 100644
index 000000000..a91e02045
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/clubs/page.tsx
@@ -0,0 +1,54 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createVerbandApi } from '@kit/verbandsverwaltung/api';
+import { VerbandTabNavigation, ClubsDataTable } from '@kit/verbandsverwaltung/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+  searchParams: Promise<Record<string, string | string[] | undefined>>;
+}
+
+export default async function ClubsPage({ params, searchParams }: Props) {
+  const { account } = await params;
+  const search = await searchParams;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createVerbandApi(client);
+  const page = Number(search.page) || 1;
+  const showArchived = search.archived === '1';
+
+  const [result, types] = await Promise.all([
+    api.listClubs(acct.id, {
+      search: search.q as string,
+      typeId: search.type as string,
+      archived: showArchived ? undefined : false,
+      page,
+      pageSize: 25,
+    }),
+    api.listTypes(acct.id),
+  ]);
+
+  return (
+    <CmsPageShell account={account} title="Verbandsverwaltung - Vereine">
+      <VerbandTabNavigation account={account} activeTab="clubs" />
+      <ClubsDataTable
+        data={result.data}
+        total={result.total}
+        page={page}
+        pageSize={25}
+        account={account}
+        types={types.map((t) => ({ id: t.id, name: t.name }))}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/verband/layout.tsx b/apps/web/app/[locale]/home/[account]/verband/layout.tsx
new file mode 100644
index 000000000..d461913eb
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/layout.tsx
@@ -0,0 +1,5 @@
+import { ReactNode } from 'react';
+
+export default function VerbandLayout({ children }: { children: ReactNode }) {
+  return <>{children}</>;
+}
diff --git a/apps/web/app/[locale]/home/[account]/verband/page.tsx b/apps/web/app/[locale]/home/[account]/verband/page.tsx
new file mode 100644
index 000000000..558674223
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/page.tsx
@@ -0,0 +1,33 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createVerbandApi } from '@kit/verbandsverwaltung/api';
+import { VerbandTabNavigation, VerbandDashboard } from '@kit/verbandsverwaltung/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface PageProps {
+  params: Promise<{ account: string }>;
+}
+
+export default async function VerbandPage({ params }: PageProps) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createVerbandApi(client);
+  const stats = await api.getDashboardStats(acct.id);
+
+  return (
+    <CmsPageShell account={account} title="Verbandsverwaltung">
+      <VerbandTabNavigation account={account} activeTab="overview" />
+      <VerbandDashboard stats={stats} account={account} />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/verband/settings/_components/settings-content.tsx b/apps/web/app/[locale]/home/[account]/verband/settings/_components/settings-content.tsx
new file mode 100644
index 000000000..d85d72b35
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/settings/_components/settings-content.tsx
@@ -0,0 +1,255 @@
+'use client';
+
+import { useState } from 'react';
+import { useAction } from 'next-safe-action/hooks';
+
+import { Plus, Pencil, Trash2, Settings } from 'lucide-react';
+
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { Input } from '@kit/ui/input';
+import { toast } from '@kit/ui/sonner';
+
+import {
+  createRole,
+  updateRole,
+  deleteRole,
+  createAssociationType,
+  updateAssociationType,
+  deleteAssociationType,
+  createFeeType,
+  updateFeeType,
+  deleteFeeType,
+} from '@kit/verbandsverwaltung/actions/verband-actions';
+
+interface SettingsContentProps {
+  accountId: string;
+  roles: Array<Record<string, unknown>>;
+  types: Array<Record<string, unknown>>;
+  feeTypes: Array<Record<string, unknown>>;
+}
+
+function SettingsSection({
+  title,
+  items,
+  onAdd,
+  onUpdate,
+  onDelete,
+  isAdding,
+  isUpdating,
+}: {
+  title: string;
+  items: Array<Record<string, unknown>>;
+  onAdd: (name: string, description?: string) => void;
+  onUpdate: (id: string, name: string) => void;
+  onDelete: (id: string) => void;
+  isAdding: boolean;
+  isUpdating: boolean;
+}) {
+  const [showAdd, setShowAdd] = useState(false);
+  const [newName, setNewName] = useState('');
+  const [newDesc, setNewDesc] = useState('');
+  const [editingId, setEditingId] = useState<string | null>(null);
+  const [editName, setEditName] = useState('');
+
+  return (
+    <Card>
+      <CardHeader className="flex flex-row items-center justify-between">
+        <CardTitle className="flex items-center gap-2 text-base">
+          <Settings className="h-4 w-4" />
+          {title}
+        </CardTitle>
+        {!showAdd && (
+          <Button size="sm" onClick={() => setShowAdd(true)}>
+            <Plus className="mr-2 h-4 w-4" />
+            Hinzufügen
+          </Button>
+        )}
+      </CardHeader>
+      <CardContent>
+        {showAdd && (
+          <div className="mb-4 flex gap-2 rounded-lg border p-3">
+            <Input
+              placeholder="Name"
+              value={newName}
+              onChange={(e) => setNewName(e.target.value)}
+              className="flex-1"
+            />
+            <Input
+              placeholder="Beschreibung (optional)"
+              value={newDesc}
+              onChange={(e) => setNewDesc(e.target.value)}
+              className="flex-1"
+            />
+            <Button
+              size="sm"
+              disabled={!newName.trim() || isAdding}
+              onClick={() => {
+                onAdd(newName.trim(), newDesc.trim() || undefined);
+                setNewName('');
+                setNewDesc('');
+                setShowAdd(false);
+              }}
+            >
+              Erstellen
+            </Button>
+            <Button size="sm" variant="outline" onClick={() => setShowAdd(false)}>
+              Abbrechen
+            </Button>
+          </div>
+        )}
+
+        {items.length === 0 ? (
+          <p className="text-sm text-muted-foreground">Keine Einträge vorhanden.</p>
+        ) : (
+          <div className="space-y-2">
+            {items.map((item) => (
+              <div key={String(item.id)} className="flex items-center justify-between rounded-lg border p-3">
+                {editingId === String(item.id) ? (
+                  <div className="flex flex-1 gap-2">
+                    <Input
+                      value={editName}
+                      onChange={(e) => setEditName(e.target.value)}
+                      className="flex-1"
+                    />
+                    <Button
+                      size="sm"
+                      disabled={!editName.trim() || isUpdating}
+                      onClick={() => {
+                        onUpdate(String(item.id), editName.trim());
+                        setEditingId(null);
+                      }}
+                    >
+                      Speichern
+                    </Button>
+                    <Button size="sm" variant="outline" onClick={() => setEditingId(null)}>
+                      Abbrechen
+                    </Button>
+                  </div>
+                ) : (
+                  <>
+                    <div>
+                      <span className="font-medium">{String(item.name)}</span>
+                      {item.description && (
+                        <p className="text-xs text-muted-foreground">{String(item.description)}</p>
+                      )}
+                    </div>
+                    <div className="flex gap-1">
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => {
+                          setEditingId(String(item.id));
+                          setEditName(String(item.name));
+                        }}
+                      >
+                        <Pencil className="h-4 w-4" />
+                      </Button>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => onDelete(String(item.id))}
+                      >
+                        <Trash2 className="h-4 w-4 text-destructive" />
+                      </Button>
+                    </div>
+                  </>
+                )}
+              </div>
+            ))}
+          </div>
+        )}
+      </CardContent>
+    </Card>
+  );
+}
+
+export default function SettingsContent({
+  accountId,
+  roles,
+  types,
+  feeTypes,
+}: SettingsContentProps) {
+  // Roles
+  const { execute: execCreateRole, isPending: isCreatingRole } = useAction(createRole, {
+    onSuccess: () => toast.success('Funktion erstellt'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+  const { execute: execUpdateRole, isPending: isUpdatingRole } = useAction(updateRole, {
+    onSuccess: () => toast.success('Funktion aktualisiert'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+  const { execute: execDeleteRole } = useAction(deleteRole, {
+    onSuccess: () => toast.success('Funktion gelöscht'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+
+  // Types
+  const { execute: execCreateType, isPending: isCreatingType } = useAction(createAssociationType, {
+    onSuccess: () => toast.success('Vereinstyp erstellt'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+  const { execute: execUpdateType, isPending: isUpdatingType } = useAction(updateAssociationType, {
+    onSuccess: () => toast.success('Vereinstyp aktualisiert'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+  const { execute: execDeleteType } = useAction(deleteAssociationType, {
+    onSuccess: () => toast.success('Vereinstyp gelöscht'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+
+  // Fee Types
+  const { execute: execCreateFeeType, isPending: isCreatingFee } = useAction(createFeeType, {
+    onSuccess: () => toast.success('Beitragsart erstellt'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+  const { execute: execUpdateFeeType, isPending: isUpdatingFee } = useAction(updateFeeType, {
+    onSuccess: () => toast.success('Beitragsart aktualisiert'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+  const { execute: execDeleteFeeType } = useAction(deleteFeeType, {
+    onSuccess: () => toast.success('Beitragsart gelöscht'),
+    onError: ({ error }) => toast.error(error.serverError ?? 'Fehler'),
+  });
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <h1 className="text-2xl font-bold">Einstellungen</h1>
+        <p className="text-muted-foreground">
+          Funktionen, Vereinstypen und Beitragsarten verwalten
+        </p>
+      </div>
+
+      <SettingsSection
+        title="Funktionen (Rollen)"
+        items={roles}
+        onAdd={(name, description) => execCreateRole({ accountId, name, description, sortOrder: 0 })}
+        onUpdate={(id, name) => execUpdateRole({ roleId: id, name })}
+        onDelete={(id) => execDeleteRole({ roleId: id })}
+        isAdding={isCreatingRole}
+        isUpdating={isUpdatingRole}
+      />
+
+      <SettingsSection
+        title="Vereinstypen"
+        items={types}
+        onAdd={(name, description) => execCreateType({ accountId, name, description, sortOrder: 0 })}
+        onUpdate={(id, name) => execUpdateType({ typeId: id, name })}
+        onDelete={(id) => execDeleteType({ typeId: id })}
+        isAdding={isCreatingType}
+        isUpdating={isUpdatingType}
+      />
+
+      <SettingsSection
+        title="Beitragsarten"
+        items={feeTypes}
+        onAdd={(name, description) => execCreateFeeType({ accountId, name, description, isActive: true })}
+        onUpdate={(id, name) => execUpdateFeeType({ feeTypeId: id, name })}
+        onDelete={(id) => execDeleteFeeType({ feeTypeId: id })}
+        isAdding={isCreatingFee}
+        isUpdating={isUpdatingFee}
+      />
+    </div>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/verband/settings/page.tsx b/apps/web/app/[locale]/home/[account]/verband/settings/page.tsx
new file mode 100644
index 000000000..e4d418ef8
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/settings/page.tsx
@@ -0,0 +1,44 @@
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { createVerbandApi } from '@kit/verbandsverwaltung/api';
+import { VerbandTabNavigation } from '@kit/verbandsverwaltung/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+
+import SettingsContent from './_components/settings-content';
+import { AccountNotFound } from '~/components/account-not-found';
+
+interface Props {
+  params: Promise<{ account: string }>;
+}
+
+export default async function SettingsPage({ params }: Props) {
+  const { account } = await params;
+  const client = getSupabaseServerClient();
+
+  const { data: acct } = await client
+    .from('accounts')
+    .select('id')
+    .eq('slug', account)
+    .single();
+
+  if (!acct) return <AccountNotFound />;
+
+  const api = createVerbandApi(client);
+  const [roles, types, feeTypes] = await Promise.all([
+    api.listRoles(acct.id),
+    api.listTypes(acct.id),
+    api.listFeeTypes(acct.id),
+  ]);
+
+  return (
+    <CmsPageShell account={account} title="Verbandsverwaltung - Einstellungen">
+      <VerbandTabNavigation account={account} activeTab="settings" />
+      <SettingsContent
+        accountId={acct.id}
+        roles={roles}
+        types={types}
+        feeTypes={feeTypes}
+      />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/verband/statistics/_components/statistics-content.tsx b/apps/web/app/[locale]/home/[account]/verband/statistics/_components/statistics-content.tsx
new file mode 100644
index 000000000..9ee2dc3b4
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/statistics/_components/statistics-content.tsx
@@ -0,0 +1,100 @@
+'use client';
+
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { BarChart3 } from 'lucide-react';
+import {
+  AreaChart,
+  Area,
+  XAxis,
+  YAxis,
+  CartesianGrid,
+  Tooltip,
+  ResponsiveContainer,
+} from 'recharts';
+
+const PLACEHOLDER_DATA = [
+  { year: '2020', vereine: 12, mitglieder: 850 },
+  { year: '2021', vereine: 14, mitglieder: 920 },
+  { year: '2022', vereine: 15, mitglieder: 980 },
+  { year: '2023', vereine: 16, mitglieder: 1050 },
+  { year: '2024', vereine: 18, mitglieder: 1120 },
+  { year: '2025', vereine: 19, mitglieder: 1200 },
+];
+
+export default function StatisticsContent() {
+  return (
+    <div className="space-y-6">
+      <div>
+        <h1 className="text-2xl font-bold">Statistik</h1>
+        <p className="text-muted-foreground">
+          Entwicklung der Mitgliedsvereine und Gesamtmitglieder im Zeitverlauf
+        </p>
+      </div>
+
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
+        <Card>
+          <CardHeader>
+            <CardTitle className="flex items-center gap-2 text-base">
+              <BarChart3 className="h-4 w-4" />
+              Vereinsentwicklung
+            </CardTitle>
+          </CardHeader>
+          <CardContent>
+            <ResponsiveContainer width="100%" height={300}>
+              <AreaChart data={PLACEHOLDER_DATA}>
+                <CartesianGrid strokeDasharray="3 3" />
+                <XAxis dataKey="year" />
+                <YAxis />
+                <Tooltip />
+                <Area
+                  type="monotone"
+                  dataKey="vereine"
+                  stroke="hsl(var(--primary))"
+                  fill="hsl(var(--primary))"
+                  fillOpacity={0.1}
+                  name="Vereine"
+                />
+              </AreaChart>
+            </ResponsiveContainer>
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardHeader>
+            <CardTitle className="flex items-center gap-2 text-base">
+              <BarChart3 className="h-4 w-4" />
+              Mitgliederentwicklung
+            </CardTitle>
+          </CardHeader>
+          <CardContent>
+            <ResponsiveContainer width="100%" height={300}>
+              <AreaChart data={PLACEHOLDER_DATA}>
+                <CartesianGrid strokeDasharray="3 3" />
+                <XAxis dataKey="year" />
+                <YAxis />
+                <Tooltip />
+                <Area
+                  type="monotone"
+                  dataKey="mitglieder"
+                  stroke="hsl(var(--chart-2))"
+                  fill="hsl(var(--chart-2))"
+                  fillOpacity={0.1}
+                  name="Mitglieder"
+                />
+              </AreaChart>
+            </ResponsiveContainer>
+          </CardContent>
+        </Card>
+      </div>
+
+      <Card>
+        <CardContent className="p-6">
+          <p className="text-sm text-muted-foreground">
+            Die Statistiken werden automatisch aus den Vereinsdaten und der Verbandshistorie berechnet.
+            Pflegen Sie die Mitgliederzahlen in den einzelnen Vereinsdetails, um aktuelle Auswertungen zu erhalten.
+          </p>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/apps/web/app/[locale]/home/[account]/verband/statistics/page.tsx b/apps/web/app/[locale]/home/[account]/verband/statistics/page.tsx
new file mode 100644
index 000000000..03a992413
--- /dev/null
+++ b/apps/web/app/[locale]/home/[account]/verband/statistics/page.tsx
@@ -0,0 +1,20 @@
+import { VerbandTabNavigation } from '@kit/verbandsverwaltung/components';
+
+import { CmsPageShell } from '~/components/cms-page-shell';
+
+import StatisticsContent from './_components/statistics-content';
+
+interface Props {
+  params: Promise<{ account: string }>;
+}
+
+export default async function StatisticsPage({ params }: Props) {
+  const { account } = await params;
+
+  return (
+    <CmsPageShell account={account} title="Verbandsverwaltung - Statistik">
+      <VerbandTabNavigation account={account} activeTab="statistics" />
+      <StatisticsContent />
+    </CmsPageShell>
+  );
+}
diff --git a/apps/web/app/api/club/course-register/route.ts b/apps/web/app/api/club/course-register/route.ts
new file mode 100644
index 000000000..8c3085c85
--- /dev/null
+++ b/apps/web/app/api/club/course-register/route.ts
@@ -0,0 +1,52 @@
+import { NextResponse } from 'next/server';
+
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
+
+export async function POST(request: Request) {
+  try {
+    const body = await request.json();
+    const { courseId, firstName, lastName, email, phone } = body;
+
+    if (!courseId || !firstName || !lastName || !email) {
+      return NextResponse.json(
+        { error: 'Kurs-ID, Vorname, Nachname und E-Mail sind erforderlich' },
+        { status: 400 },
+      );
+    }
+
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+      return NextResponse.json(
+        { error: 'Ungültige E-Mail-Adresse' },
+        { status: 400 },
+      );
+    }
+
+    const supabase = getSupabaseServerAdminClient();
+
+    const { error } = await supabase.from('course_participants').insert({
+      course_id: courseId,
+      first_name: firstName,
+      last_name: lastName,
+      email,
+      phone: phone || null,
+      status: 'enrolled',
+      enrolled_at: new Date().toISOString(),
+    });
+
+    if (error) {
+      console.error('[course-register] Insert error:', error.message);
+      return NextResponse.json(
+        { error: 'Anmeldung fehlgeschlagen' },
+        { status: 500 },
+      );
+    }
+
+    return NextResponse.json({
+      success: true,
+      message: 'Anmeldung erfolgreich',
+    });
+  } catch (err) {
+    console.error('[course-register] Error:', err);
+    return NextResponse.json({ error: 'Serverfehler' }, { status: 500 });
+  }
+}
diff --git a/apps/web/app/api/club/event-register/route.ts b/apps/web/app/api/club/event-register/route.ts
new file mode 100644
index 000000000..433d25d3d
--- /dev/null
+++ b/apps/web/app/api/club/event-register/route.ts
@@ -0,0 +1,64 @@
+import { NextResponse } from 'next/server';
+
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
+
+export async function POST(request: Request) {
+  try {
+    const body = await request.json();
+    const {
+      eventId,
+      firstName,
+      lastName,
+      email,
+      phone,
+      dateOfBirth,
+      parentName,
+      parentPhone,
+    } = body;
+
+    if (!eventId || !firstName || !lastName || !email) {
+      return NextResponse.json(
+        { error: 'Event-ID, Vorname, Nachname und E-Mail sind erforderlich' },
+        { status: 400 },
+      );
+    }
+
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+      return NextResponse.json(
+        { error: 'Ungültige E-Mail-Adresse' },
+        { status: 400 },
+      );
+    }
+
+    const supabase = getSupabaseServerAdminClient();
+
+    const { error } = await supabase.from('event_registrations').insert({
+      event_id: eventId,
+      first_name: firstName,
+      last_name: lastName,
+      email,
+      phone: phone || null,
+      date_of_birth: dateOfBirth || null,
+      parent_name: parentName || null,
+      parent_phone: parentPhone || null,
+      status: 'registered',
+      created_at: new Date().toISOString(),
+    });
+
+    if (error) {
+      console.error('[event-register] Insert error:', error.message);
+      return NextResponse.json(
+        { error: 'Anmeldung fehlgeschlagen' },
+        { status: 500 },
+      );
+    }
+
+    return NextResponse.json({
+      success: true,
+      message: 'Anmeldung erfolgreich',
+    });
+  } catch (err) {
+    console.error('[event-register] Error:', err);
+    return NextResponse.json({ error: 'Serverfehler' }, { status: 500 });
+  }
+}
diff --git a/apps/web/app/api/club/membership-apply/route.ts b/apps/web/app/api/club/membership-apply/route.ts
new file mode 100644
index 000000000..fd1edc7ee
--- /dev/null
+++ b/apps/web/app/api/club/membership-apply/route.ts
@@ -0,0 +1,70 @@
+import { NextResponse } from 'next/server';
+
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
+
+export async function POST(request: Request) {
+  try {
+    const body = await request.json();
+    const {
+      accountId,
+      firstName,
+      lastName,
+      email,
+      phone,
+      street,
+      postalCode,
+      city,
+      dateOfBirth,
+      message,
+    } = body;
+
+    if (!accountId || !firstName || !lastName || !email) {
+      return NextResponse.json(
+        {
+          error:
+            'Konto-ID, Vorname, Nachname und E-Mail sind erforderlich',
+        },
+        { status: 400 },
+      );
+    }
+
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+      return NextResponse.json(
+        { error: 'Ungültige E-Mail-Adresse' },
+        { status: 400 },
+      );
+    }
+
+    const supabase = getSupabaseServerAdminClient();
+
+    const { error } = await supabase.from('membership_applications').insert({
+      account_id: accountId,
+      first_name: firstName,
+      last_name: lastName,
+      email,
+      phone: phone || null,
+      street: street || null,
+      postal_code: postalCode || null,
+      city: city || null,
+      date_of_birth: dateOfBirth || null,
+      message: message || null,
+      status: 'submitted',
+    });
+
+    if (error) {
+      console.error('[membership-apply] Insert error:', error.message);
+      return NextResponse.json(
+        { error: 'Bewerbung fehlgeschlagen' },
+        { status: 500 },
+      );
+    }
+
+    return NextResponse.json({
+      success: true,
+      message: 'Bewerbung erfolgreich eingereicht',
+    });
+  } catch (err) {
+    console.error('[membership-apply] Error:', err);
+    return NextResponse.json({ error: 'Serverfehler' }, { status: 500 });
+  }
+}
diff --git a/apps/web/app/api/healthcheck/route.ts b/apps/web/app/api/healthcheck/route.ts
index 551961c66..53ccfb018 100644
--- a/apps/web/app/api/healthcheck/route.ts
+++ b/apps/web/app/api/healthcheck/route.ts
@@ -29,9 +29,10 @@ async function getSupabaseHealthCheck() {
     const { data, error } = await client
       .from('config')
       .select('billing_provider')
-      .single();
+      .limit(1)
+      .maybeSingle();
 
-    return !error && Boolean(data?.billing_provider);
+    return !error;
   } catch {
     return false;
   }
diff --git a/apps/web/components/account-not-found.tsx b/apps/web/components/account-not-found.tsx
new file mode 100644
index 000000000..e9ba61e93
--- /dev/null
+++ b/apps/web/components/account-not-found.tsx
@@ -0,0 +1,22 @@
+import Link from 'next/link';
+import { AlertTriangle } from 'lucide-react';
+import { Button } from '@kit/ui/button';
+
+export function AccountNotFound() {
+  return (
+    <div className="flex flex-col items-center justify-center py-24 text-center">
+      <div className="mb-4 rounded-full bg-destructive/10 p-4">
+        <AlertTriangle className="h-8 w-8 text-destructive" />
+      </div>
+      <h2 className="text-xl font-semibold">Konto nicht gefunden</h2>
+      <p className="mt-2 max-w-md text-sm text-muted-foreground">
+        Das angeforderte Konto existiert nicht oder Sie haben keine Berechtigung darauf zuzugreifen.
+      </p>
+      <div className="mt-6">
+        <Link href="/home">
+          <Button variant="outline">Zum Dashboard</Button>
+        </Link>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/components/confirm-dialog.tsx b/apps/web/components/confirm-dialog.tsx
new file mode 100644
index 000000000..a853e25f6
--- /dev/null
+++ b/apps/web/components/confirm-dialog.tsx
@@ -0,0 +1,55 @@
+'use client';
+
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from '@kit/ui/alert-dialog';
+
+interface ConfirmDialogProps {
+  trigger: React.ReactNode;
+  title: string;
+  description: string;
+  confirmLabel?: string;
+  cancelLabel?: string;
+  variant?: 'default' | 'destructive';
+  onConfirm: () => void;
+}
+
+export function ConfirmDialog({
+  trigger,
+  title,
+  description,
+  confirmLabel = 'Bestätigen',
+  cancelLabel = 'Abbrechen',
+  variant = 'default',
+  onConfirm,
+}: ConfirmDialogProps) {
+  return (
+    <AlertDialog>
+      <AlertDialogTrigger render={trigger as React.ReactElement}>
+      </AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>{title}</AlertDialogTitle>
+          <AlertDialogDescription>{description}</AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter>
+          <AlertDialogCancel>{cancelLabel}</AlertDialogCancel>
+          <AlertDialogAction
+            onClick={onConfirm}
+            className={variant === 'destructive' ? 'bg-destructive text-destructive-foreground hover:bg-destructive/90' : ''}
+          >
+            {confirmLabel}
+          </AlertDialogAction>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+}
diff --git a/apps/web/config/feature-flags.config.ts b/apps/web/config/feature-flags.config.ts
index e7128773d..c27140c7f 100644
--- a/apps/web/config/feature-flags.config.ts
+++ b/apps/web/config/feature-flags.config.ts
@@ -51,6 +51,9 @@ const FeatureFlagsSchema = z.object({
   enableNewsletter: z.boolean().default(true),
   enableGdprCompliance: z.boolean().default(true),
   enableSiteBuilder: z.boolean().default(true),
+  enableFischerei: z.boolean().default(false),
+  enableMeetingProtocols: z.boolean().default(false),
+  enableVerbandsverwaltung: z.boolean().default(false),
 });
 
 const featuresFlagConfig = FeatureFlagsSchema.parse({
@@ -137,6 +140,18 @@ const featuresFlagConfig = FeatureFlagsSchema.parse({
     process.env.NEXT_PUBLIC_ENABLE_SITE_BUILDER,
     true,
   ),
+  enableFischerei: getBoolean(
+    process.env.NEXT_PUBLIC_ENABLE_FISCHEREI,
+    false,
+  ),
+  enableMeetingProtocols: getBoolean(
+    process.env.NEXT_PUBLIC_ENABLE_MEETING_PROTOCOLS,
+    false,
+  ),
+  enableVerbandsverwaltung: getBoolean(
+    process.env.NEXT_PUBLIC_ENABLE_VERBANDSVERWALTUNG,
+    false,
+  ),
 } satisfies z.output<typeof FeatureFlagsSchema>);
 
 export default featuresFlagConfig;
diff --git a/apps/web/config/paths.config.ts b/apps/web/config/paths.config.ts
index 71f4daedb..f7e9941ce 100644
--- a/apps/web/config/paths.config.ts
+++ b/apps/web/config/paths.config.ts
@@ -31,6 +31,9 @@ const PathsSchema = z.object({
     accountDocuments: z.string().min(1),
     accountNewsletter: z.string().min(1),
     accountSiteBuilder: z.string().min(1),
+    accountFischerei: z.string().min(1),
+    accountMeetings: z.string().min(1),
+    accountVerband: z.string().min(1),
   }),
 });
 
@@ -65,6 +68,9 @@ const pathsConfig = PathsSchema.parse({
     accountDocuments: `/home/[account]/documents`,
     accountNewsletter: `/home/[account]/newsletter`,
     accountSiteBuilder: `/home/[account]/site-builder`,
+    accountFischerei: `/home/[account]/fischerei`,
+    accountMeetings: '/home/[account]/meetings',
+    accountVerband: '/home/[account]/verband',
   },
 } satisfies z.output<typeof PathsSchema>);
 
diff --git a/apps/web/i18n/messages/de/cms.json b/apps/web/i18n/messages/de/cms.json
index 4154d8097..1fb592984 100644
--- a/apps/web/i18n/messages/de/cms.json
+++ b/apps/web/i18n/messages/de/cms.json
@@ -170,7 +170,34 @@
     "holidayPasses": "Ferienpässe",
     "eventDate": "Datum",
     "eventLocation": "Ort",
-    "capacity": "Plätze"
+    "capacity": "Plätze",
+    "allEvents": "Alle Veranstaltungen",
+    "locations": "Orte",
+    "totalCapacity": "Kapazität gesamt",
+    "noEvents": "Keine Veranstaltungen vorhanden",
+    "noEventsDescription": "Erstellen Sie Ihre erste Veranstaltung, um loszulegen.",
+    "name": "Name",
+    "status": "Status",
+    "paginationPage": "Seite {page} von {totalPages}",
+    "paginationPrevious": "Vorherige",
+    "paginationNext": "Nächste",
+    "registrationsOverview": "Anmeldungen aller Veranstaltungen im Überblick",
+    "totalRegistrations": "Anmeldungen gesamt",
+    "withRegistrations": "Mit Anmeldungen",
+    "overviewByEvent": "Übersicht nach Veranstaltung",
+    "noEventsForRegistrations": "Erstellen Sie eine Veranstaltung, um Anmeldungen zu erhalten.",
+    "utilization": "Auslastung",
+    "event": "Veranstaltung",
+    "holidayPassesDescription": "Ferienpässe und Ferienprogramme verwalten",
+    "newHolidayPass": "Neuer Ferienpass",
+    "noHolidayPasses": "Keine Ferienpässe vorhanden",
+    "noHolidayPassesDescription": "Erstellen Sie Ihren ersten Ferienpass.",
+    "allHolidayPasses": "Alle Ferienpässe",
+    "year": "Jahr",
+    "price": "Preis",
+    "validFrom": "Gültig von",
+    "validUntil": "Gültig bis",
+    "newEventDescription": "Veranstaltung oder Ferienprogramm anlegen"
   },
   "finance": {
     "title": "Finanzen",
@@ -259,7 +286,15 @@
     "finance.write": "Finanzen bearbeiten",
     "finance.sepa": "SEPA-Einzüge ausführen",
     "documents.generate": "Dokumente generieren",
-    "newsletter.send": "Newsletter versenden"
+    "newsletter.send": "Newsletter versenden",
+    "fischerei.read": "Fischerei lesen",
+    "fischerei.write": "Fischerei bearbeiten",
+    "meetings.read": "Sitzungsprotokolle lesen",
+    "meetings.write": "Sitzungsprotokolle bearbeiten",
+    "meetings.delete": "Sitzungsprotokolle löschen",
+    "verband.read": "Verbandsverwaltung lesen",
+    "verband.write": "Verbandsverwaltung bearbeiten",
+    "verband.delete": "Verbandsverwaltung löschen"
   },
   "status": {
     "active": "Aktiv",
@@ -267,5 +302,477 @@
     "archived": "Archiviert",
     "locked": "Gesperrt",
     "deleted": "Gelöscht"
+  },
+  "fischerei": {
+    "title": "Fischerei",
+    "description": "Gewässer, Fischarten, Besatz, Pachten, Fangbücher und Wettbewerbe verwalten",
+    "dashboard": {
+      "title": "Übersicht",
+      "watersCount": "Gewässer",
+      "speciesCount": "Fischarten",
+      "activeLeases": "Aktive Pachten",
+      "pendingCatchBooks": "Offene Fangbücher",
+      "upcomingCompetitions": "Kommende Wettbewerbe",
+      "stockingCostYtd": "Besatzkosten (lfd. Jahr)",
+      "recentStocking": "Letzte Besatzaktionen",
+      "pendingReview": "Zur Prüfung ausstehend"
+    },
+    "waters": {
+      "title": "Gewässer",
+      "newWater": "Neues Gewässer",
+      "editWater": "Gewässer bearbeiten",
+      "name": "Name",
+      "shortName": "Kurzname",
+      "waterType": "Gewässertyp",
+      "description": "Beschreibung",
+      "surfaceArea": "Fläche (ha)",
+      "length": "Länge (m)",
+      "width": "Breite (m)",
+      "avgDepth": "Durchschnittstiefe (m)",
+      "maxDepth": "Maximaltiefe (m)",
+      "outflow": "Abfluss",
+      "location": "Lage/Standort",
+      "county": "Landkreis",
+      "gpsCoordinates": "GPS-Koordinaten",
+      "lfvNumber": "LFV-Nummer",
+      "lfvName": "LFV-Name",
+      "costShares": "Kostenanteile",
+      "electrofishing": "Elektrofischerei-Genehmigung beantragt",
+      "costCenter": "Kostenstelle",
+      "archived": "Archiviert",
+      "showArchived": "Archivierte anzeigen",
+      "speciesRules": "Fischarten & Regelungen",
+      "stockingHistory": "Besatzhistorie",
+      "leases": "Pachten",
+      "inspectors": "Kontrolleure",
+      "map": "Karte",
+      "catchStats": "Fangstatistik",
+      "waterTypes": {
+        "fluss": "Fluss",
+        "bach": "Bach",
+        "see": "See",
+        "teich": "Teich",
+        "weiher": "Weiher",
+        "kanal": "Kanal",
+        "stausee": "Stausee",
+        "baggersee": "Baggersee",
+        "sonstige": "Sonstige"
+      },
+      "basicData": "Grunddaten",
+      "dimensions": "Abmessungen",
+      "geography": "Geografie",
+      "administration": "Verwaltung"
+    },
+    "species": {
+      "title": "Fischarten",
+      "newSpecies": "Neue Fischart",
+      "editSpecies": "Fischart bearbeiten",
+      "name": "Name",
+      "nameLatin": "Lateinischer Name",
+      "nameLocal": "Lokaler Name",
+      "maxAge": "Max. Alter (Jahre)",
+      "maxWeight": "Max. Gewicht (kg)",
+      "maxLength": "Max. Länge (cm)",
+      "protectedMinSize": "Schonmaß (cm)",
+      "protectionPeriod": "Schonzeit",
+      "protectionStart": "Schonzeit Beginn (MM.TT)",
+      "protectionEnd": "Schonzeit Ende (MM.TT)",
+      "spawningSeason": "Sonderschonzeit (SZG)",
+      "kFactor": "K-Faktor",
+      "kFactorAvg": "K-Faktor (Durchschnitt)",
+      "kFactorMin": "K-Faktor (Min)",
+      "kFactorMax": "K-Faktor (Max)",
+      "pricePerUnit": "Preis pro Einheit",
+      "maxCatchPerDay": "Max. Fang/Tag",
+      "maxCatchPerYear": "Max. Fang/Jahr",
+      "individualRecording": "Einzelerfassung",
+      "active": "Aktiv",
+      "biometrics": "Biometrische Daten",
+      "protection": "Schutzbestimmungen",
+      "quotas": "Fangbegrenzungen"
+    },
+    "stocking": {
+      "title": "Besatz",
+      "newStocking": "Besatz eintragen",
+      "date": "Besatzdatum",
+      "water": "Gewässer",
+      "species": "Fischart",
+      "quantity": "Anzahl (Stück)",
+      "weight": "Gewicht (kg)",
+      "ageClass": "Altersklasse",
+      "cost": "Kosten (EUR)",
+      "supplier": "Lieferant",
+      "remarks": "Bemerkungen",
+      "ageClasses": {
+        "brut": "Brut",
+        "soemmerlinge": "Sömmerlinge",
+        "einsoemmerig": "1-sömmrig",
+        "zweisoemmerig": "2-sömmrig",
+        "dreisoemmerig": "3-sömmrig",
+        "vorgestreckt": "Vorgestreckt",
+        "setzlinge": "Setzlinge",
+        "laichfische": "Laichfische",
+        "sonstige": "Sonstige"
+      },
+      "totalCost": "Gesamtkosten",
+      "totalQuantity": "Gesamtmenge"
+    },
+    "leases": {
+      "title": "Pachten",
+      "newLease": "Neue Pacht",
+      "editLease": "Pacht bearbeiten",
+      "lessor": "Verpächter",
+      "lessorAddress": "Adresse des Verpächters",
+      "startDate": "Beginn",
+      "endDate": "Ende",
+      "duration": "Laufzeit (Jahre)",
+      "initialAmount": "Anfangsbetrag (EUR)",
+      "fixedIncrease": "Feste jährl. Erhöhung (EUR)",
+      "percentageIncrease": "Prozentuale jährl. Erhöhung (%)",
+      "paymentMethod": "Zahlungsart",
+      "specialAgreements": "Sondervereinbarungen",
+      "currentAmount": "Aktueller Jahresbetrag",
+      "paymentMethods": {
+        "bar": "Bar",
+        "lastschrift": "Lastschrift",
+        "ueberweisung": "Überweisung"
+      }
+    },
+    "catchBooks": {
+      "title": "Fangbücher",
+      "newCatchBook": "Neues Fangbuch",
+      "member": "Mitglied",
+      "year": "Jahr",
+      "fishingDays": "Angeltage",
+      "totalCatches": "Gesamtfänge",
+      "status": "Status",
+      "verification": "Bewertung",
+      "submit": "Einreichen",
+      "review": "Prüfen",
+      "approve": "Akzeptieren",
+      "reject": "Ablehnen",
+      "submitted": "Eingereicht am",
+      "checked": "Geprüft",
+      "flyFisher": "Fliegenfischer",
+      "cardNumbers": "Erlaubnisschein-Nr.",
+      "statuses": {
+        "offen": "Offen",
+        "eingereicht": "Eingereicht",
+        "geprueft": "Geprüft",
+        "akzeptiert": "Akzeptiert",
+        "abgelehnt": "Abgelehnt"
+      },
+      "verifications": {
+        "sehrgut": "Sehr gut",
+        "gut": "Gut",
+        "ok": "OK",
+        "schlecht": "Schlecht",
+        "falsch": "Falsch",
+        "leer": "Leer"
+      }
+    },
+    "catches": {
+      "title": "Fänge",
+      "newCatch": "Fang eintragen",
+      "date": "Datum",
+      "species": "Fischart",
+      "water": "Gewässer",
+      "quantity": "Anzahl",
+      "length": "Länge (cm)",
+      "weight": "Gewicht (g)",
+      "kFactor": "K-Faktor",
+      "sizeCategory": "Größenkategorie",
+      "gender": "Geschlecht",
+      "permit": "Erlaubnisschein"
+    },
+    "permits": {
+      "title": "Erlaubnisscheine",
+      "newPermit": "Neuer Erlaubnisschein",
+      "name": "Bezeichnung",
+      "shortCode": "Kurzcode",
+      "primaryWater": "Hauptgewässer",
+      "totalQuantity": "Gesamtmenge",
+      "forSale": "Zum Verkauf",
+      "quotas": "Kontingente"
+    },
+    "inspectors": {
+      "title": "Gewässer-Kontrolleure",
+      "assignInspector": "Kontrolleur zuweisen",
+      "removeInspector": "Kontrolleur entfernen",
+      "assignmentStart": "Beginn",
+      "assignmentEnd": "Ende"
+    },
+    "competitions": {
+      "title": "Wettbewerbe",
+      "newCompetition": "Neuer Wettbewerb",
+      "name": "Bezeichnung",
+      "date": "Datum",
+      "water": "Gewässer",
+      "maxParticipants": "Max. Teilnehmer",
+      "scoring": "Wertung",
+      "scoreByCount": "Nach Anzahl",
+      "scoreByHeaviest": "Nach Schwerster",
+      "scoreByTotalWeight": "Nach Gesamtgewicht",
+      "scoreByLongest": "Nach Längstem",
+      "scoreByTotalLength": "Nach Gesamtlänge",
+      "participants": "Teilnehmer",
+      "addParticipant": "Teilnehmer hinzufügen",
+      "results": "Ergebnisse",
+      "computeResults": "Ergebnisse berechnen",
+      "categories": "Kategorien",
+      "rank": "Platz"
+    },
+    "suppliers": {
+      "title": "Lieferanten",
+      "newSupplier": "Neuer Lieferant",
+      "name": "Name",
+      "contactPerson": "Ansprechpartner",
+      "phone": "Telefon",
+      "email": "E-Mail",
+      "address": "Adresse"
+    },
+    "statistics": {
+      "title": "Statistiken",
+      "catchesBySpecies": "Fänge nach Fischart",
+      "catchesByWater": "Fänge nach Gewässer",
+      "catchesByYear": "Fänge nach Jahr",
+      "stockingOverview": "Besatzübersicht",
+      "totalCatches": "Gesamtfänge",
+      "totalWeight": "Gesamtgewicht (kg)",
+      "avgLength": "Durchschn. Länge (cm)",
+      "avgKFactor": "Durchschn. K-Faktor",
+      "filterYear": "Jahr filtern",
+      "filterWater": "Gewässer filtern"
+    },
+    "export": {
+      "exportStocking": "Besatz exportieren",
+      "exportCatches": "Fänge exportieren",
+      "formatCsv": "CSV",
+      "formatExcel": "Excel"
+    }
+  },
+  "meetings": {
+    "title": "Sitzungsprotokolle",
+    "description": "Sitzungen, Tagesordnungspunkte und Beschlüsse verwalten",
+    "dashboard": {
+      "title": "Übersicht",
+      "totalMeetings": "Sitzungen gesamt",
+      "openDecisions": "Offene Beschlüsse",
+      "upcomingMeetings": "Kommende Sitzungen",
+      "recentProtocols": "Letzte Protokolle"
+    },
+    "bodies": {
+      "title": "Gremien",
+      "newBody": "Neues Gremium",
+      "editBody": "Gremium bearbeiten",
+      "deleteBody": "Gremium löschen",
+      "name": "Name",
+      "shortName": "Kurzname",
+      "description": "Beschreibung",
+      "chairperson": "Vorsitzende(r)",
+      "members": "Mitglieder",
+      "meetingCycle": "Sitzungszyklus",
+      "active": "Aktiv",
+      "cycles": {
+        "weekly": "Wöchentlich",
+        "biweekly": "Zweiwöchentlich",
+        "monthly": "Monatlich",
+        "quarterly": "Vierteljährlich",
+        "biannual": "Halbjährlich",
+        "annual": "Jährlich",
+        "asNeeded": "Nach Bedarf"
+      }
+    },
+    "sessions": {
+      "title": "Sitzungen",
+      "newSession": "Neue Sitzung",
+      "editSession": "Sitzung bearbeiten",
+      "deleteSession": "Sitzung löschen",
+      "body": "Gremium",
+      "date": "Datum",
+      "startTime": "Beginn",
+      "endTime": "Ende",
+      "location": "Ort",
+      "status": "Status",
+      "agenda": "Tagesordnung",
+      "protocol": "Protokoll",
+      "attendees": "Anwesende",
+      "absentees": "Abwesende",
+      "guests": "Gäste",
+      "recorder": "Protokollführer(in)",
+      "statuses": {
+        "planned": "Geplant",
+        "inProgress": "Laufend",
+        "completed": "Abgeschlossen",
+        "cancelled": "Abgesagt"
+      }
+    },
+    "agendaItems": {
+      "title": "Tagesordnungspunkte",
+      "newItem": "Neuer TOP",
+      "editItem": "TOP bearbeiten",
+      "deleteItem": "TOP löschen",
+      "number": "TOP-Nr.",
+      "subject": "Betreff",
+      "description": "Beschreibung",
+      "presenter": "Berichterstatter(in)",
+      "duration": "Dauer (Min.)",
+      "type": "Art",
+      "attachments": "Anlagen",
+      "notes": "Notizen",
+      "types": {
+        "information": "Information",
+        "discussion": "Diskussion",
+        "decision": "Beschluss",
+        "election": "Wahl",
+        "report": "Bericht",
+        "miscellaneous": "Verschiedenes"
+      }
+    },
+    "decisions": {
+      "title": "Beschlüsse",
+      "newDecision": "Neuer Beschluss",
+      "editDecision": "Beschluss bearbeiten",
+      "deleteDecision": "Beschluss löschen",
+      "number": "Beschluss-Nr.",
+      "subject": "Betreff",
+      "text": "Beschlusstext",
+      "result": "Ergebnis",
+      "votesFor": "Ja-Stimmen",
+      "votesAgainst": "Nein-Stimmen",
+      "abstentions": "Enthaltungen",
+      "responsible": "Verantwortlich",
+      "deadline": "Frist",
+      "status": "Status",
+      "remarks": "Bemerkungen",
+      "results": {
+        "accepted": "Angenommen",
+        "rejected": "Abgelehnt",
+        "deferred": "Vertagt",
+        "withdrawn": "Zurückgezogen"
+      },
+      "statuses": {
+        "open": "Offen",
+        "inProgress": "In Bearbeitung",
+        "completed": "Erledigt",
+        "overdue": "Überfällig"
+      }
+    },
+    "attendance": {
+      "title": "Anwesenheit",
+      "present": "Anwesend",
+      "absent": "Abwesend",
+      "excused": "Entschuldigt",
+      "arrivedLate": "Verspätet erschienen",
+      "leftEarly": "Vorzeitig gegangen"
+    },
+    "protocol": {
+      "generate": "Protokoll generieren",
+      "preview": "Vorschau",
+      "export": "Exportieren",
+      "sign": "Unterschreiben",
+      "finalize": "Fertigstellen",
+      "formatPdf": "PDF",
+      "formatDocx": "Word"
+    }
+  },
+  "verband": {
+    "title": "Verbandsverwaltung",
+    "description": "Mitgliedsvereine, Kontaktpersonen, Beiträge und Statistiken verwalten",
+    "dashboard": {
+      "title": "Übersicht",
+      "totalClubs": "Mitgliedsvereine gesamt",
+      "totalMembers": "Mitglieder gesamt",
+      "pendingDues": "Ausstehende Beiträge",
+      "upcomingEvents": "Kommende Veranstaltungen"
+    },
+    "clubs": {
+      "title": "Mitgliedsvereine",
+      "newClub": "Neuer Verein",
+      "editClub": "Verein bearbeiten",
+      "deleteClub": "Verein löschen",
+      "name": "Vereinsname",
+      "shortName": "Kurzname",
+      "number": "Vereinsnummer",
+      "address": "Adresse",
+      "postalCode": "PLZ",
+      "city": "Ort",
+      "phone": "Telefon",
+      "email": "E-Mail",
+      "website": "Webseite",
+      "founded": "Gründungsjahr",
+      "memberCount": "Mitgliederzahl",
+      "joinedDate": "Beitrittsdatum",
+      "status": "Status",
+      "contacts": "Kontaktpersonen",
+      "dues": "Beiträge",
+      "notes": "Bemerkungen",
+      "statuses": {
+        "active": "Aktiv",
+        "inactive": "Inaktiv",
+        "suspended": "Ruhend",
+        "withdrawn": "Ausgetreten"
+      }
+    },
+    "contacts": {
+      "title": "Kontaktpersonen",
+      "newContact": "Neue Kontaktperson",
+      "editContact": "Kontaktperson bearbeiten",
+      "deleteContact": "Kontaktperson löschen",
+      "firstName": "Vorname",
+      "lastName": "Nachname",
+      "role": "Funktion",
+      "phone": "Telefon",
+      "email": "E-Mail",
+      "isPrimary": "Hauptkontakt",
+      "roles": {
+        "chairman": "Vorsitzende(r)",
+        "viceChairman": "Stellv. Vorsitzende(r)",
+        "treasurer": "Kassenwart(in)",
+        "secretary": "Schriftführer(in)",
+        "youthLeader": "Jugendleiter(in)",
+        "boardMember": "Vorstandsmitglied",
+        "delegate": "Delegierte(r)",
+        "other": "Sonstige"
+      }
+    },
+    "dues": {
+      "title": "Beiträge",
+      "newDue": "Neuer Beitrag",
+      "editDue": "Beitrag bearbeiten",
+      "year": "Jahr",
+      "amount": "Betrag (EUR)",
+      "dueDate": "Fälligkeitsdatum",
+      "paidDate": "Bezahlt am",
+      "status": "Status",
+      "invoiceNumber": "Rechnungsnummer",
+      "remarks": "Bemerkungen",
+      "statuses": {
+        "open": "Offen",
+        "paid": "Bezahlt",
+        "overdue": "Überfällig",
+        "waived": "Erlassen",
+        "partial": "Teilbezahlt"
+      },
+      "bulkCreate": "Beiträge generieren",
+      "bulkCreateDescription": "Beiträge für alle aktiven Vereine erstellen",
+      "totalOpen": "Gesamt offen",
+      "totalPaid": "Gesamt bezahlt"
+    },
+    "statistics": {
+      "title": "Statistiken",
+      "membersByClub": "Mitglieder nach Verein",
+      "membersTrend": "Mitgliederentwicklung",
+      "duesOverview": "Beitragsübersicht",
+      "clubsByRegion": "Vereine nach Region",
+      "filterYear": "Jahr filtern"
+    },
+    "export": {
+      "exportClubs": "Vereine exportieren",
+      "exportContacts": "Kontaktpersonen exportieren",
+      "exportDues": "Beiträge exportieren",
+      "formatCsv": "CSV",
+      "formatExcel": "Excel"
+    }
   }
 }
diff --git a/apps/web/i18n/messages/de/common.json b/apps/web/i18n/messages/de/common.json
index c2a96071b..99ba5a813 100644
--- a/apps/web/i18n/messages/de/common.json
+++ b/apps/web/i18n/messages/de/common.json
@@ -75,7 +75,10 @@
     "documents": "Dokumente",
     "newsletter": "Newsletter",
     "events": "Veranstaltungen",
-    "siteBuilder": "Website"
+    "siteBuilder": "Website",
+    "fischerei": "Fischerei",
+    "meetings": "Sitzungsprotokolle",
+    "verband": "Verbandsverwaltung"
   },
   "roles": {
     "owner": {
diff --git a/apps/web/i18n/messages/de/marketing.json b/apps/web/i18n/messages/de/marketing.json
index a97597998..efdb7a9ff 100644
--- a/apps/web/i18n/messages/de/marketing.json
+++ b/apps/web/i18n/messages/de/marketing.json
@@ -31,8 +31,8 @@
   "privacyPolicy": "Datenschutzerklärung",
   "privacyPolicyDescription": "Unsere Datenschutzerklärung und Datennutzung",
   "contactDescription": "Kontaktieren Sie uns bei Fragen oder Feedback",
-  "contactHeading": "Senden Sie uns eine Nachricht",
-  "contactSubheading": "Wir melden uns schnellstmöglich bei Ihnen",
+  "contactHeading": "Wir sind für Sie da",
+  "contactSubheading": "Persönliche Beratung, Testzugänge und individuelle Angebote — sprechen Sie uns an.",
   "contactName": "Ihr Name",
   "contactEmail": "Ihre E-Mail-Adresse",
   "contactMessage": "Ihre Nachricht",
@@ -41,78 +41,78 @@
   "contactError": "Fehler beim Senden Ihrer Nachricht",
   "contactSuccessDescription": "Wir haben Ihre Nachricht erhalten und melden uns schnellstmöglich",
   "contactErrorDescription": "Beim Senden ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut",
-  "footerDescription": "Die All-in-One-Verwaltungsplattform für Vereine, Clubs und Organisationen. Entwickelt von Com.BISS GmbH.",
-  "copyright": "© Copyright {year} {product}. Alle Rechte vorbehalten.",
+  "footerDescription": "Vereins- und Verbandsverwaltung aus Bayern — persönlich, zuverlässig und fair seit 2004. Entwickelt von Com.BISS GmbH, Schierling.",
+  "copyright": "© 2004–{year} Com.BISS GmbH. Alle Rechte vorbehalten.",
 
-  "heroPill": "Die nächste Generation der Vereinsverwaltung",
-  "heroTitle": "Verwalten Sie Ihre Organisation. Einfach und effizient.",
-  "heroSubtitle": "MyEasyCMS ist die All-in-One-Plattform für Vereine, Clubs und Organisationen. Verwalten Sie Mitglieder, Kurse, Veranstaltungen, Finanzen und mehr — alles an einem Ort.",
+  "heroPill": "Seit 2004 — 22 Jahre Erfahrung",
+  "heroTitle": "Vereinsverwaltung, die mitwächst",
+  "heroSubtitle": "Von der Mitgliederverwaltung bis zum SEPA-Einzug — die Software, der Vereine und Verbände in ganz Bayern seit zwei Jahrzehnten vertrauen. 69.000 verwaltete Mitglieder, 90+ angebundene Vereine.",
 
-  "trustedBy": "Vertraut von Vereinen und Clubs in ganz Deutschland",
-  "trustAssociations": "Vereine",
-  "trustSchools": "Bildungseinrichtungen",
-  "trustClubs": "Sport- & Angelvereine",
-  "trustOrganizations": "Gemeinnützige Organisationen",
+  "trustedBy": "Vertraut von Vereinen und Verbänden in ganz Bayern",
+  "trustAssociations": "3 Bezirksfischereiverbände",
+  "trustSchools": "VHS & Bildungseinrichtungen",
+  "trustClubs": "90+ Vereine angebunden",
+  "trustOrganizations": "Stadt Regensburg seit 2010",
 
-  "featuresHeading": "Alles, was Ihre Organisation braucht",
-  "featuresSubheading": "Von der Mitgliederverwaltung bis zur Finanzbuchhaltung — alle Werkzeuge in einer modernen, benutzerfreundlichen Plattform.",
+  "featuresHeading": "Alles, was Ihr Verein braucht",
+  "featuresSubheading": "MYeasyCMS wurde speziell für die Bedürfnisse von Vereinen und Verbänden entwickelt — modular aufgebaut, webbasiert und über jeden Browser nutzbar.",
   "featuresLabel": "Kernmodule",
 
   "featureMembersTitle": "Mitgliederverwaltung",
-  "featureMembersDesc": "Verwalten Sie alle Mitglieder mit Abteilungen, Beitragsverfolgung, Mitgliedsausweisen, Anträgen und detaillierten Statistiken.",
+  "featureMembersDesc": "Stammdaten, Kontaktinformationen, Mandate, Ehrungen, Historie und Notizen — alles an einem Ort. Mit Abteilungen, Beitragsverfolgung und Mitgliedsausweisen.",
   "featureCoursesTitle": "Kursverwaltung",
-  "featureCoursesDesc": "Organisieren Sie Kurse mit Terminplanung, Dozentenzuweisung, Anwesenheitsverfolgung, Kategorien und Standorten.",
+  "featureCoursesDesc": "Kurs-, Dozenten- und Teilnehmerverwaltung mit Kalender, Ferien- und Feiertagsberücksichtigung, Kostenkalkulation und Online-Anmeldung.",
   "featureBookingsTitle": "Raumbuchungen",
-  "featureBookingsDesc": "Buchen Sie Räume und Ressourcen mit einem visuellen Kalender, verwalten Sie Gäste und prüfen Sie die Verfügbarkeit.",
+  "featureBookingsDesc": "Reservierungsverwaltung mit Belegungsübersicht, Ferienberücksichtigung und Schlüsselmanagement für den Gebäudezugang.",
   "featureEventsTitle": "Veranstaltungsverwaltung",
-  "featureEventsDesc": "Planen und verwalten Sie Veranstaltungen mit Anmeldungen, Ferienpässen und Teilnehmerverfolgung.",
-  "featureFinanceTitle": "Finanzen & Abrechnung",
-  "featureFinanceDesc": "Erstellen Sie Rechnungen, verwalten Sie Zahlungen und SEPA-Lastschrifteinzüge — behalten Sie Ihre Finanzen mühelos im Griff.",
-  "featureNewsletterTitle": "Newsletter",
-  "featureNewsletterDesc": "Erstellen und versenden Sie professionelle Newsletter mit Vorlagen. Halten Sie Ihre Mitglieder informiert.",
+  "featureEventsDesc": "Planen und verwalten Sie Veranstaltungen mit Anmeldungen, Ferienpässen und Teilnehmerverfolgung — in Zusammenarbeit mit der Stadt Regensburg entwickelt.",
+  "featureFinanceTitle": "Beiträge & SEPA",
+  "featureFinanceDesc": "Beitrags- und Gebührenverwaltung, SEPA-Lastschriftmandate, XML-Export und Kontenführung nach Geschäftsjahren. Rechnungen und Zahlungen im Griff.",
+  "featureNewsletterTitle": "E-Mail & Newsletter",
+  "featureNewsletterDesc": "E-Mail-Kommunikation mit Mitgliedern und Newsletter-Versand mit Vorlagen. Halten Sie Ihre Mitglieder informiert.",
 
   "showcaseHeading": "Ein leistungsstarkes Dashboard auf einen Blick",
-  "showcaseDescription": "Erhalten Sie einen vollständigen Überblick über Ihre Organisation mit unserem intuitiven Dashboard. Greifen Sie auf alles zu — Mitglieder, Kurse, Veranstaltungen und Finanzen — von einer zentralen Stelle aus.",
+  "showcaseDescription": "Erhalten Sie einen vollständigen Überblick über Ihre Organisation — Mitglieder, Kurse, offene Rechnungen und Veranstaltungen — alles von einer zentralen Stelle aus. Schnellaktionen für die häufigsten Aufgaben.",
 
   "additionalFeaturesHeading": "Und es gibt noch mehr",
-  "additionalFeaturesSubheading": "Zusätzliche Werkzeuge, die jeden Aspekt der täglichen Arbeit Ihrer Organisation vereinfachen.",
+  "additionalFeaturesSubheading": "Zusätzliche Werkzeuge, die jeden Aspekt der täglichen Vereinsarbeit vereinfachen.",
   "additionalFeaturesLabel": "Weitere Funktionen",
 
-  "featureDocumentsTitle": "Dokumentenverwaltung",
-  "featureDocumentsDesc": "Erstellen Sie Dokumente aus Vorlagen, verwalten Sie Dateien und halten Sie alle wichtigen Unterlagen organisiert.",
-  "featureSiteBuilderTitle": "Website-Baukasten",
-  "featureSiteBuilderDesc": "Erstellen und verwalten Sie die Website Ihrer Organisation ohne Programmierkenntnisse. Aktualisieren Sie Inhalte ganz einfach.",
+  "featureDocumentsTitle": "Dokumente & Ausweise",
+  "featureDocumentsDesc": "Mitgliedsausweise, Rechnungen, Etiketten, Berichte, Briefe und Zertifikate — aus Vorlagen generiert, exportierbar als PDF und Excel.",
+  "featureSiteBuilderTitle": "Vereins-Website",
+  "featureSiteBuilderDesc": "Erstellen Sie die öffentliche Website Ihres Vereins ohne Programmierkenntnisse — mit Drag-and-Drop-Editor, Veranstaltungen und Kursangebot direkt aus dem CMS.",
   "featureModulesTitle": "Individuelle Module",
-  "featureModulesDesc": "Erweitern Sie die Plattform mit maßgeschneiderten Modulen für Ihre spezifischen Anforderungen. Importieren Sie Daten und passen Sie Einstellungen an.",
+  "featureModulesDesc": "Erweitern Sie die Plattform mit eigenen Datenmodulen für Gewässer, Fangbücher, Arbeitsdienste oder beliebige weitere Vereinsdaten.",
 
-  "whyChooseHeading": "Warum Organisationen MyEasyCMS wählen",
-  "whyChooseDescription": "Entwickelt mit über 20 Jahren Erfahrung im Dienste von Vereinen, Clubs und gemeinnützigen Organisationen in ganz Deutschland.",
-  "whyResponsiveTitle": "Mobilfreundlich",
-  "whyResponsiveDesc": "Greifen Sie von jedem Gerät auf Ihre Daten zu. Unser responsives Design funktioniert perfekt auf Desktop, Tablet und Smartphone.",
-  "whySecureTitle": "Sicher & Zuverlässig",
-  "whySecureDesc": "Ihre Daten sind mit erstklassiger Sicherheit geschützt. Regelmäßige Backups stellen sicher, dass nichts verloren geht.",
-  "whySupportTitle": "Persönlicher Support",
-  "whySupportDesc": "Erhalten Sie direkten, persönlichen Support von unserem Team. Wir sprechen Ihre Sprache und verstehen Ihre Bedürfnisse.",
-  "whyGdprTitle": "DSGVO-konform",
-  "whyGdprDesc": "Vollständig konform mit der europäischen Datenschutz-Grundverordnung. Die Daten Ihrer Mitglieder werden sorgfältig behandelt.",
+  "whyChooseHeading": "Warum Vereine Com.BISS vertrauen",
+  "whyChooseDescription": "2004 schlossen sich fünf Frauen zusammen und gründeten eine Web-Agentur. Seitdem arbeiten wir Hand in Hand mit unseren Kunden — persönlich, fair und zuverlässig. Geschäftsführerinnen: Brit Schiergl und Elisabeth Zehetbauer.",
+  "whyResponsiveTitle": "Persönlich",
+  "whyResponsiveDesc": "Wir kennen unsere Kunden und deren Anforderungen. Kein anonymes Ticketsystem — direkter Kontakt mit den Menschen, die Ihre Software entwickeln.",
+  "whySecureTitle": "Zuverlässig",
+  "whySecureDesc": "22 Jahre Kundenbeziehungen sprechen für sich. Wir unterstützen Sie auch außerhalb der üblichen Arbeitszeiten — schnell und unkompliziert.",
+  "whySupportTitle": "Fair",
+  "whySupportDesc": "Faire Preise, schnelle und flexible Umsetzung der Kundenwünsche. Neuentwicklungen und Änderungen zu festen Preisen — keine Überraschungen.",
+  "whyGdprTitle": "100% Server in Deutschland",
+  "whyGdprDesc": "Sitz in Schierling bei Regensburg. Server in Deutschland. DSGVO-konform. Ihre Daten bleiben hier.",
 
   "howItWorksHeading": "In drei einfachen Schritten loslegen",
-  "howItWorksSubheading": "Die Einrichtung Ihrer Organisation auf MyEasyCMS dauert nur wenige Minuten.",
-  "howStep1Title": "Konto erstellen",
-  "howStep1Desc": "Registrieren Sie sich kostenlos und richten Sie Ihr Organisationsprofil ein. Keine Kreditkarte erforderlich.",
+  "howItWorksSubheading": "Die Einrichtung Ihres Vereins auf MYeasyCMS dauert nur wenige Minuten.",
+  "howStep1Title": "Testzugang anfragen",
+  "howStep1Desc": "Fordern Sie einen kostenlosen Testzugang an — wir richten alles für Sie ein und führen Sie persönlich durch die Plattform.",
   "howStep2Title": "Module konfigurieren",
-  "howStep2Desc": "Aktivieren Sie die benötigten Module — Mitglieder, Kurse, Veranstaltungen, Finanzen — und passen Sie diese an Ihren Workflow an.",
-  "howStep3Title": "Team einladen",
-  "howStep3Desc": "Fügen Sie Teammitglieder mit verschiedenen Rollen und Berechtigungen hinzu. Verwalten Sie Ihre Organisation gemeinsam.",
+  "howStep2Desc": "Aktivieren Sie die benötigten Module — Mitglieder, Beiträge, Gewässer, SEPA — und passen Sie diese an Ihren Verein an.",
+  "howStep3Title": "Vereinsverwaltung starten",
+  "howStep3Desc": "Importieren Sie Ihre bestehenden Mitgliederlisten und legen Sie sofort los — mit persönlicher Unterstützung durch unser Team.",
 
-  "pricingPillLabel": "Kostenlos starten",
-  "pricingPillText": "Keine Kreditkarte erforderlich.",
-  "pricingHeading": "Faire Preise für alle Arten von Organisationen",
-  "pricingSubheading": "Starten Sie mit unserem kostenlosen Tarif und upgraden Sie, wenn Sie bereit sind.",
+  "pricingPillLabel": "Faire Preise",
+  "pricingPillText": "Keine Begrenzung der Benutzeranzahl",
+  "pricingHeading": "Faire Preise nach Vereinsgröße",
+  "pricingSubheading": "Alle Funktionen inklusive. Keine versteckten Kosten. Persönliche Einrichtung bei jedem Tarif.",
 
-  "ctaHeading": "Bereit, die Verwaltung Ihrer Organisation zu vereinfachen?",
-  "ctaDescription": "Schließen Sie sich hunderten von Vereinen, Clubs und Organisationen an, die MyEasyCMS bereits nutzen.",
-  "ctaButtonPrimary": "Jetzt kostenlos starten",
-  "ctaButtonSecondary": "Kontakt aufnehmen",
-  "ctaNote": "Keine Kreditkarte erforderlich. Kostenloser Tarif verfügbar."
+  "ctaHeading": "Bereit für eine Verwaltung, die einfach funktioniert?",
+  "ctaDescription": "Fordern Sie einen kostenlosen Testzugang an — oder lassen Sie sich persönlich beraten. Telefon: 09451 9499-09.",
+  "ctaButtonPrimary": "Kostenlosen Testzugang anfragen",
+  "ctaButtonSecondary": "Persönlich beraten lassen",
+  "ctaNote": "Kein Risiko. Persönliche Einrichtung inklusive. DSGVO-konform."
 }
diff --git a/apps/web/i18n/messages/en/cms.json b/apps/web/i18n/messages/en/cms.json
index 8ede39e99..04f8acd71 100644
--- a/apps/web/i18n/messages/en/cms.json
+++ b/apps/web/i18n/messages/en/cms.json
@@ -170,7 +170,34 @@
     "holidayPasses": "Holiday Passes",
     "eventDate": "Date",
     "eventLocation": "Location",
-    "capacity": "Capacity"
+    "capacity": "Capacity",
+    "allEvents": "All Events",
+    "locations": "Locations",
+    "totalCapacity": "Total Capacity",
+    "noEvents": "No events yet",
+    "noEventsDescription": "Create your first event to get started.",
+    "name": "Name",
+    "status": "Status",
+    "paginationPage": "Page {page} of {totalPages}",
+    "paginationPrevious": "Previous",
+    "paginationNext": "Next",
+    "registrationsOverview": "Overview of registrations across all events",
+    "totalRegistrations": "Total Registrations",
+    "withRegistrations": "With Registrations",
+    "overviewByEvent": "Overview by Event",
+    "noEventsForRegistrations": "Create an event to start receiving registrations.",
+    "utilization": "Utilization",
+    "event": "Event",
+    "holidayPassesDescription": "Manage holiday passes and programs",
+    "newHolidayPass": "New Holiday Pass",
+    "noHolidayPasses": "No holiday passes yet",
+    "noHolidayPassesDescription": "Create your first holiday pass.",
+    "allHolidayPasses": "All Holiday Passes",
+    "year": "Year",
+    "price": "Price",
+    "validFrom": "Valid From",
+    "validUntil": "Valid Until",
+    "newEventDescription": "Create an event or holiday program"
   },
   "finance": {
     "title": "Finance",
diff --git a/apps/web/i18n/messages/en/common.json b/apps/web/i18n/messages/en/common.json
index aa7a4fd06..1212393ba 100644
--- a/apps/web/i18n/messages/en/common.json
+++ b/apps/web/i18n/messages/en/common.json
@@ -75,7 +75,10 @@
     "siteBuilder": "Website",
     "finance": "Finance",
     "documents": "Documents",
-    "newsletter": "Newsletter"
+    "newsletter": "Newsletter",
+    "fischerei": "Fisheries",
+    "meetings": "Meeting Protocols",
+    "verband": "Federation Management"
   },
   "roles": {
     "owner": {
diff --git a/apps/web/lib/status-badges.ts b/apps/web/lib/status-badges.ts
new file mode 100644
index 000000000..a1152049b
--- /dev/null
+++ b/apps/web/lib/status-badges.ts
@@ -0,0 +1,127 @@
+export const MEMBER_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  active: 'default',
+  inactive: 'secondary',
+  pending: 'outline',
+  resigned: 'destructive',
+  excluded: 'destructive',
+};
+
+export const MEMBER_STATUS_LABEL: Record<string, string> = {
+  active: 'Aktiv',
+  inactive: 'Inaktiv',
+  pending: 'Ausstehend',
+  resigned: 'Ausgetreten',
+  excluded: 'Ausgeschlossen',
+};
+
+export const INVOICE_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  draft: 'outline',
+  sent: 'secondary',
+  paid: 'default',
+  overdue: 'destructive',
+  cancelled: 'destructive',
+};
+
+export const INVOICE_STATUS_LABEL: Record<string, string> = {
+  draft: 'Entwurf',
+  sent: 'Gesendet',
+  paid: 'Bezahlt',
+  overdue: 'Überfällig',
+  cancelled: 'Storniert',
+};
+
+export const BATCH_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  draft: 'outline',
+  submitted: 'secondary',
+  processing: 'secondary',
+  completed: 'default',
+  failed: 'destructive',
+};
+
+export const BATCH_STATUS_LABEL: Record<string, string> = {
+  draft: 'Entwurf',
+  submitted: 'Eingereicht',
+  processing: 'In Bearbeitung',
+  completed: 'Abgeschlossen',
+  failed: 'Fehlgeschlagen',
+};
+
+export const NEWSLETTER_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  draft: 'outline',
+  scheduled: 'secondary',
+  sending: 'secondary',
+  sent: 'default',
+  failed: 'destructive',
+};
+
+export const NEWSLETTER_STATUS_LABEL: Record<string, string> = {
+  draft: 'Entwurf',
+  scheduled: 'Geplant',
+  sending: 'Wird gesendet',
+  sent: 'Gesendet',
+  failed: 'Fehlgeschlagen',
+};
+
+export const EVENT_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  planned: 'outline',
+  open: 'secondary',
+  full: 'secondary',
+  running: 'default',
+  completed: 'default',
+  cancelled: 'destructive',
+};
+
+export const EVENT_STATUS_LABEL: Record<string, string> = {
+  planned: 'Geplant',
+  open: 'Offen',
+  full: 'Ausgebucht',
+  running: 'Laufend',
+  completed: 'Abgeschlossen',
+  cancelled: 'Abgesagt',
+};
+
+export const COURSE_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  planned: 'outline',
+  open: 'default',
+  active: 'default',
+  running: 'secondary',
+  completed: 'secondary',
+  cancelled: 'destructive',
+};
+
+export const COURSE_STATUS_LABEL: Record<string, string> = {
+  planned: 'Geplant',
+  open: 'Offen',
+  active: 'Aktiv',
+  running: 'Laufend',
+  completed: 'Abgeschlossen',
+  cancelled: 'Abgesagt',
+};
+
+export const APPLICATION_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  submitted: 'outline',
+  review: 'secondary',
+  approved: 'default',
+  rejected: 'destructive',
+};
+
+export const APPLICATION_STATUS_LABEL: Record<string, string> = {
+  submitted: 'Eingereicht',
+  review: 'In Prüfung',
+  approved: 'Genehmigt',
+  rejected: 'Abgelehnt',
+};
+
+export const NEWSLETTER_RECIPIENT_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  pending: 'secondary',
+  sent: 'default',
+  failed: 'destructive',
+  bounced: 'destructive',
+};
+
+export const NEWSLETTER_RECIPIENT_STATUS_LABEL: Record<string, string> = {
+  pending: 'Ausstehend',
+  sent: 'Gesendet',
+  failed: 'Fehlgeschlagen',
+  bounced: 'Zurückgewiesen',
+};
diff --git a/apps/web/package.json b/apps/web/package.json
index aa85ddcfa..12e2d774d 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -84,8 +84,11 @@
     "zod": "catalog:"
   },
   "devDependencies": {
+    "@kit/fischerei": "workspace:*",
     "@kit/site-builder": "workspace:*",
+    "@kit/sitzungsprotokolle": "workspace:*",
     "@kit/tsconfig": "workspace:*",
+    "@kit/verbandsverwaltung": "workspace:*",
     "@next/bundle-analyzer": "catalog:",
     "@tailwindcss/postcss": "catalog:",
     "@types/react": "catalog:",
diff --git a/apps/web/supabase/migrations/20260412000001_fischerei.sql b/apps/web/supabase/migrations/20260412000001_fischerei.sql
new file mode 100644
index 000000000..969600ced
--- /dev/null
+++ b/apps/web/supabase/migrations/20260412000001_fischerei.sql
@@ -0,0 +1,862 @@
+/*
+ * -------------------------------------------------------
+ * Fischerei (Fishing Association Management) Schema
+ * Waters, species, stocking, leases, catch books,
+ * catches, permits, inspectors, competitions
+ * -------------------------------------------------------
+ */
+
+-- =====================================================
+-- 1. Enums
+-- =====================================================
+
+CREATE TYPE public.water_type AS ENUM(
+  'fluss', 'bach', 'see', 'teich', 'weiher', 'kanal', 'stausee', 'baggersee', 'sonstige'
+);
+
+CREATE TYPE public.fish_age_class AS ENUM(
+  'brut', 'soemmerlinge', 'einsoemmerig', 'zweisoemmerig', 'dreisoemmerig', 'vorgestreckt', 'setzlinge', 'laichfische', 'sonstige'
+);
+
+CREATE TYPE public.catch_book_status AS ENUM(
+  'offen', 'eingereicht', 'geprueft', 'akzeptiert', 'abgelehnt'
+);
+
+CREATE TYPE public.catch_book_verification AS ENUM(
+  'sehrgut', 'gut', 'ok', 'schlecht', 'falsch', 'leer'
+);
+
+CREATE TYPE public.lease_payment_method AS ENUM(
+  'bar', 'lastschrift', 'ueberweisung'
+);
+
+CREATE TYPE public.fish_gender AS ENUM(
+  'maennlich', 'weiblich', 'unbekannt'
+);
+
+CREATE TYPE public.fish_size_category AS ENUM(
+  'gross', 'mittel', 'klein'
+);
+
+-- =====================================================
+-- 2. Extend app_permissions
+-- =====================================================
+
+ALTER TYPE public.app_permissions ADD VALUE IF NOT EXISTS 'fischerei.read';
+ALTER TYPE public.app_permissions ADD VALUE IF NOT EXISTS 'fischerei.write';
+
+-- =====================================================
+-- 3. cost_centers (shared, may already exist)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.cost_centers (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  name text NOT NULL,
+  code text,
+  description text,
+  is_active boolean NOT NULL DEFAULT true,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX IF NOT EXISTS ix_cost_centers_account ON public.cost_centers(account_id);
+ALTER TABLE public.cost_centers ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.cost_centers FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.cost_centers TO authenticated;
+GRANT ALL ON public.cost_centers TO service_role;
+
+CREATE POLICY cost_centers_select ON public.cost_centers FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY cost_centers_mutate ON public.cost_centers FOR ALL TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'finance.write'::public.app_permissions));
+
+-- =====================================================
+-- 4. fish_suppliers
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.fish_suppliers (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  name text NOT NULL,
+  contact_person text,
+  phone text,
+  email text,
+  address text,
+  notes text,
+  is_active boolean NOT NULL DEFAULT true,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_fish_suppliers_account ON public.fish_suppliers(account_id);
+ALTER TABLE public.fish_suppliers ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.fish_suppliers FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.fish_suppliers TO authenticated;
+GRANT ALL ON public.fish_suppliers TO service_role;
+
+CREATE POLICY fish_suppliers_select ON public.fish_suppliers FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY fish_suppliers_insert ON public.fish_suppliers FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY fish_suppliers_update ON public.fish_suppliers FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY fish_suppliers_delete ON public.fish_suppliers FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+CREATE TRIGGER trg_fish_suppliers_updated_at
+  BEFORE UPDATE ON public.fish_suppliers
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 5. waters (ve_gewaesser)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.waters (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+
+  -- Identity
+  name text NOT NULL,
+  short_name text,
+  water_type public.water_type NOT NULL DEFAULT 'sonstige',
+  description text,
+
+  -- Dimensions
+  surface_area_ha numeric(10,2),
+  length_m numeric(10,0),
+  width_m numeric(10,2),
+  avg_depth_m numeric(6,2),
+  max_depth_m numeric(6,2),
+
+  -- Geography
+  outflow text,
+  location text,
+  classification_order integer,
+  county text,
+  geo_lat numeric(10,7),
+  geo_lng numeric(10,7),
+
+  -- LFV (Landesfischereiverband)
+  lfv_number text,
+  lfv_name text,
+
+  -- Cost allocation
+  cost_share_ds numeric(5,2) DEFAULT 0,
+  cost_share_kalk numeric(5,2) DEFAULT 0,
+
+  -- Electrofishing
+  electrofishing_permit_requested boolean NOT NULL DEFAULT false,
+
+  -- HejFish integration
+  hejfish_id text,
+
+  -- References
+  cost_center_id uuid REFERENCES public.cost_centers(id) ON DELETE SET NULL,
+
+  -- Flags
+  is_archived boolean NOT NULL DEFAULT false,
+
+  -- Meta
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  updated_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_waters_account ON public.waters(account_id);
+CREATE INDEX ix_waters_name ON public.waters(account_id, name);
+CREATE INDEX ix_waters_type ON public.waters(account_id, water_type);
+CREATE INDEX ix_waters_archived ON public.waters(account_id, is_archived);
+
+ALTER TABLE public.waters ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.waters FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.waters TO authenticated;
+GRANT ALL ON public.waters TO service_role;
+
+CREATE POLICY waters_select ON public.waters FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY waters_insert ON public.waters FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY waters_update ON public.waters FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY waters_delete ON public.waters FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+CREATE TRIGGER trg_waters_updated_at
+  BEFORE UPDATE ON public.waters
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 6. fish_species (ve_fischarten)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.fish_species (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+
+  -- Names
+  name text NOT NULL,
+  name_latin text,
+  name_local text,
+
+  -- Status
+  is_active boolean NOT NULL DEFAULT true,
+
+  -- Biometrics
+  max_age_years integer,
+  max_weight_kg numeric(8,2),
+  max_length_cm numeric(6,1),
+
+  -- Protection (Schonmaß / Schonzeit)
+  protected_min_size_cm numeric(5,1),
+  protection_period_start text, -- MM.DD format
+  protection_period_end text,   -- MM.DD format
+
+  -- Spawning season (Sonderschonzeit / SZG)
+  spawning_season_start text,   -- MM.DD format
+  spawning_season_end text,     -- MM.DD format
+  has_special_spawning_season boolean NOT NULL DEFAULT false,
+
+  -- Condition factor (K-Faktor)
+  k_factor_avg numeric(6,3),
+  k_factor_min numeric(6,3),
+  k_factor_max numeric(6,3),
+
+  -- Quotas
+  price_per_unit numeric(8,2),
+  max_catch_per_day integer,
+  max_catch_per_year integer,
+
+  -- Recording
+  individual_recording boolean NOT NULL DEFAULT false,
+
+  -- Meta
+  sort_order integer NOT NULL DEFAULT 0,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_fish_species_account ON public.fish_species(account_id);
+CREATE INDEX ix_fish_species_name ON public.fish_species(account_id, name);
+CREATE INDEX ix_fish_species_active ON public.fish_species(account_id, is_active);
+
+ALTER TABLE public.fish_species ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.fish_species FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.fish_species TO authenticated;
+GRANT ALL ON public.fish_species TO service_role;
+
+CREATE POLICY fish_species_select ON public.fish_species FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY fish_species_insert ON public.fish_species FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY fish_species_update ON public.fish_species FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY fish_species_delete ON public.fish_species FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+CREATE TRIGGER trg_fish_species_updated_at
+  BEFORE UPDATE ON public.fish_species
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 7. water_species_rules (ve_gewaesser_fischart)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.water_species_rules (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  water_id uuid NOT NULL REFERENCES public.waters(id) ON DELETE CASCADE,
+  species_id uuid NOT NULL REFERENCES public.fish_species(id) ON DELETE CASCADE,
+
+  -- Overrides (null = use species default)
+  min_size_cm numeric(5,1),
+  protection_period_start text,
+  protection_period_end text,
+  max_catch_per_day integer,
+  max_catch_per_year integer,
+
+  created_at timestamptz NOT NULL DEFAULT now(),
+  UNIQUE(water_id, species_id)
+);
+
+CREATE INDEX ix_water_species_rules_water ON public.water_species_rules(water_id);
+CREATE INDEX ix_water_species_rules_species ON public.water_species_rules(species_id);
+
+ALTER TABLE public.water_species_rules ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.water_species_rules FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.water_species_rules TO authenticated;
+GRANT ALL ON public.water_species_rules TO service_role;
+
+CREATE POLICY water_species_rules_select ON public.water_species_rules FOR SELECT TO authenticated
+  USING (EXISTS (SELECT 1 FROM public.waters w WHERE w.id = water_species_rules.water_id AND public.has_role_on_account(w.account_id)));
+CREATE POLICY water_species_rules_mutate ON public.water_species_rules FOR ALL TO authenticated
+  USING (EXISTS (SELECT 1 FROM public.waters w WHERE w.id = water_species_rules.water_id AND public.has_permission(auth.uid(), w.account_id, 'fischerei.write'::public.app_permissions)));
+
+-- =====================================================
+-- 8. fish_stocking (ve_besatz)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.fish_stocking (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  water_id uuid NOT NULL REFERENCES public.waters(id) ON DELETE CASCADE,
+  species_id uuid NOT NULL REFERENCES public.fish_species(id) ON DELETE RESTRICT,
+
+  stocking_date date NOT NULL,
+  quantity integer NOT NULL DEFAULT 0,
+  weight_kg numeric(8,2),
+  age_class public.fish_age_class NOT NULL DEFAULT 'sonstige',
+  cost_euros numeric(10,2),
+  supplier_id uuid REFERENCES public.fish_suppliers(id) ON DELETE SET NULL,
+  remarks text,
+
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  updated_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_fish_stocking_account ON public.fish_stocking(account_id);
+CREATE INDEX ix_fish_stocking_water ON public.fish_stocking(water_id);
+CREATE INDEX ix_fish_stocking_species ON public.fish_stocking(species_id);
+CREATE INDEX ix_fish_stocking_date ON public.fish_stocking(stocking_date DESC);
+
+ALTER TABLE public.fish_stocking ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.fish_stocking FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.fish_stocking TO authenticated;
+GRANT ALL ON public.fish_stocking TO service_role;
+
+CREATE POLICY fish_stocking_select ON public.fish_stocking FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY fish_stocking_insert ON public.fish_stocking FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY fish_stocking_update ON public.fish_stocking FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY fish_stocking_delete ON public.fish_stocking FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+CREATE TRIGGER trg_fish_stocking_updated_at
+  BEFORE UPDATE ON public.fish_stocking
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 9. fishing_leases (ve_pachten)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.fishing_leases (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  water_id uuid NOT NULL REFERENCES public.waters(id) ON DELETE CASCADE,
+
+  -- Lessor
+  lessor_name text NOT NULL,
+  lessor_address text,
+  lessor_phone text,
+  lessor_email text,
+
+  -- Lease terms
+  start_date date NOT NULL,
+  end_date date,
+  duration_years integer,
+  initial_amount numeric(10,2) NOT NULL DEFAULT 0,
+  fixed_annual_increase numeric(10,2) DEFAULT 0,
+  percentage_annual_increase numeric(5,2) DEFAULT 0,
+
+  -- Payment
+  payment_method public.lease_payment_method DEFAULT 'ueberweisung',
+  account_holder text,
+  iban text,
+  bic text,
+
+  -- Location details
+  location_details text,
+  special_agreements text,
+
+  -- Status
+  is_archived boolean NOT NULL DEFAULT false,
+
+  -- Meta
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  updated_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_fishing_leases_account ON public.fishing_leases(account_id);
+CREATE INDEX ix_fishing_leases_water ON public.fishing_leases(water_id);
+CREATE INDEX ix_fishing_leases_dates ON public.fishing_leases(start_date, end_date);
+
+ALTER TABLE public.fishing_leases ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.fishing_leases FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.fishing_leases TO authenticated;
+GRANT ALL ON public.fishing_leases TO service_role;
+
+CREATE POLICY fishing_leases_select ON public.fishing_leases FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY fishing_leases_insert ON public.fishing_leases FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY fishing_leases_update ON public.fishing_leases FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY fishing_leases_delete ON public.fishing_leases FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+CREATE TRIGGER trg_fishing_leases_updated_at
+  BEFORE UPDATE ON public.fishing_leases
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 10. fishing_permits (ve_gewaesserkarten)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.fishing_permits (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  name text NOT NULL,
+  short_code text,
+  primary_water_id uuid REFERENCES public.waters(id) ON DELETE SET NULL,
+  total_quantity integer,
+  cost_center_id uuid REFERENCES public.cost_centers(id) ON DELETE SET NULL,
+  hejfish_id text,
+  is_for_sale boolean NOT NULL DEFAULT true,
+  is_archived boolean NOT NULL DEFAULT false,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_fishing_permits_account ON public.fishing_permits(account_id);
+ALTER TABLE public.fishing_permits ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.fishing_permits FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.fishing_permits TO authenticated;
+GRANT ALL ON public.fishing_permits TO service_role;
+
+CREATE POLICY fishing_permits_select ON public.fishing_permits FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY fishing_permits_mutate ON public.fishing_permits FOR ALL TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+CREATE TRIGGER trg_fishing_permits_updated_at
+  BEFORE UPDATE ON public.fishing_permits
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 11. permit_quotas (ve_gewaesserk_kontingent)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.permit_quotas (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  permit_id uuid NOT NULL REFERENCES public.fishing_permits(id) ON DELETE CASCADE,
+  business_year integer NOT NULL,
+  category_name text,
+  quota_quantity integer NOT NULL DEFAULT 0,
+  conversion_factor numeric(5,2) DEFAULT 1.00,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_permit_quotas_permit ON public.permit_quotas(permit_id);
+ALTER TABLE public.permit_quotas ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.permit_quotas FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.permit_quotas TO authenticated;
+GRANT ALL ON public.permit_quotas TO service_role;
+
+CREATE POLICY permit_quotas_select ON public.permit_quotas FOR SELECT TO authenticated
+  USING (EXISTS (SELECT 1 FROM public.fishing_permits p WHERE p.id = permit_quotas.permit_id AND public.has_role_on_account(p.account_id)));
+CREATE POLICY permit_quotas_mutate ON public.permit_quotas FOR ALL TO authenticated
+  USING (EXISTS (SELECT 1 FROM public.fishing_permits p WHERE p.id = permit_quotas.permit_id AND public.has_permission(auth.uid(), p.account_id, 'fischerei.write'::public.app_permissions)));
+
+-- =====================================================
+-- 12. catch_books (ve_mitglieder_fangbuch)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.catch_books (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  member_id uuid NOT NULL REFERENCES public.members(id) ON DELETE CASCADE,
+  year integer NOT NULL,
+
+  -- Denormalized for reporting
+  member_name text,
+  member_birth_date date,
+
+  -- Usage
+  fishing_days_count integer NOT NULL DEFAULT 0,
+  total_fish_caught integer NOT NULL DEFAULT 0,
+
+  -- Associated permits
+  card_numbers text,
+  is_fly_fisher boolean NOT NULL DEFAULT false,
+
+  -- Verification workflow
+  status public.catch_book_status NOT NULL DEFAULT 'offen',
+  verification public.catch_book_verification,
+  is_checked boolean NOT NULL DEFAULT false,
+  is_submitted boolean NOT NULL DEFAULT false,
+  submitted_at timestamptz,
+
+  -- HejFish
+  is_hejfish boolean NOT NULL DEFAULT false,
+  is_empty boolean NOT NULL DEFAULT false,
+  not_fished boolean NOT NULL DEFAULT false,
+
+  remarks text,
+
+  -- Meta
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  updated_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now(),
+
+  UNIQUE(account_id, member_id, year)
+);
+
+CREATE INDEX ix_catch_books_account ON public.catch_books(account_id);
+CREATE INDEX ix_catch_books_member ON public.catch_books(member_id);
+CREATE INDEX ix_catch_books_year ON public.catch_books(account_id, year);
+CREATE INDEX ix_catch_books_status ON public.catch_books(account_id, status);
+
+ALTER TABLE public.catch_books ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.catch_books FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.catch_books TO authenticated;
+GRANT ALL ON public.catch_books TO service_role;
+
+CREATE POLICY catch_books_select ON public.catch_books FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY catch_books_insert ON public.catch_books FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY catch_books_update ON public.catch_books FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY catch_books_delete ON public.catch_books FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+CREATE TRIGGER trg_catch_books_updated_at
+  BEFORE UPDATE ON public.catch_books
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 13. catches (ve_faenge)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.catches (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  catch_book_id uuid NOT NULL REFERENCES public.catch_books(id) ON DELETE CASCADE,
+  species_id uuid NOT NULL REFERENCES public.fish_species(id) ON DELETE RESTRICT,
+  water_id uuid REFERENCES public.waters(id) ON DELETE SET NULL,
+  member_id uuid REFERENCES public.members(id) ON DELETE SET NULL,
+
+  catch_date date NOT NULL,
+  quantity integer NOT NULL DEFAULT 1,
+  length_cm numeric(5,1),
+  weight_g numeric(8,0),
+
+  -- Size category
+  size_category public.fish_size_category,
+  gender public.fish_gender,
+
+  -- Flags
+  is_empty_entry boolean NOT NULL DEFAULT false,
+  has_error boolean NOT NULL DEFAULT false,
+
+  -- HejFish
+  hejfish_id text,
+
+  -- Competition link
+  competition_id uuid,
+  competition_participant_id uuid,
+
+  -- Permit
+  permit_id uuid REFERENCES public.fishing_permits(id) ON DELETE SET NULL,
+
+  remarks text,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+-- K-factor computed: weight_g / (length_cm^3) * 100000
+-- This is done application-side, not as a generated column, because
+-- it requires both non-null values and the formula is specific to fisheries.
+
+CREATE INDEX ix_catches_catch_book ON public.catches(catch_book_id);
+CREATE INDEX ix_catches_species ON public.catches(species_id);
+CREATE INDEX ix_catches_water ON public.catches(water_id);
+CREATE INDEX ix_catches_member ON public.catches(member_id);
+CREATE INDEX ix_catches_date ON public.catches(catch_date DESC);
+
+ALTER TABLE public.catches ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.catches FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.catches TO authenticated;
+GRANT ALL ON public.catches TO service_role;
+
+CREATE POLICY catches_select ON public.catches FOR SELECT TO authenticated
+  USING (EXISTS (SELECT 1 FROM public.catch_books cb WHERE cb.id = catches.catch_book_id AND public.has_role_on_account(cb.account_id)));
+CREATE POLICY catches_mutate ON public.catches FOR ALL TO authenticated
+  USING (EXISTS (SELECT 1 FROM public.catch_books cb WHERE cb.id = catches.catch_book_id AND public.has_permission(auth.uid(), cb.account_id, 'fischerei.write'::public.app_permissions)));
+
+-- =====================================================
+-- 14. water_inspectors (ve_kontrolleur_gewaesser)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.water_inspectors (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  water_id uuid NOT NULL REFERENCES public.waters(id) ON DELETE CASCADE,
+  member_id uuid NOT NULL REFERENCES public.members(id) ON DELETE CASCADE,
+  assignment_start date NOT NULL DEFAULT current_date,
+  assignment_end date,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  UNIQUE(water_id, member_id)
+);
+
+CREATE INDEX ix_water_inspectors_account ON public.water_inspectors(account_id);
+CREATE INDEX ix_water_inspectors_water ON public.water_inspectors(water_id);
+CREATE INDEX ix_water_inspectors_member ON public.water_inspectors(member_id);
+
+ALTER TABLE public.water_inspectors ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.water_inspectors FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.water_inspectors TO authenticated;
+GRANT ALL ON public.water_inspectors TO service_role;
+
+CREATE POLICY water_inspectors_select ON public.water_inspectors FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY water_inspectors_mutate ON public.water_inspectors FOR ALL TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+-- =====================================================
+-- 15. competition_categories (ve_fanglisten_rubriken)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.competition_categories (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  name text NOT NULL,
+  sort_order integer NOT NULL DEFAULT 0,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_competition_categories_account ON public.competition_categories(account_id);
+ALTER TABLE public.competition_categories ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.competition_categories FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.competition_categories TO authenticated;
+GRANT ALL ON public.competition_categories TO service_role;
+
+CREATE POLICY competition_categories_select ON public.competition_categories FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY competition_categories_mutate ON public.competition_categories FOR ALL TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+-- =====================================================
+-- 16. competitions (ve_fanglisten)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.competitions (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  event_id uuid REFERENCES public.events(id) ON DELETE SET NULL,
+  name text NOT NULL,
+  competition_date date NOT NULL,
+  permit_id uuid REFERENCES public.fishing_permits(id) ON DELETE SET NULL,
+  water_id uuid REFERENCES public.waters(id) ON DELETE SET NULL,
+  max_participants integer,
+
+  -- Scoring flags
+  score_by_count boolean NOT NULL DEFAULT false,
+  score_by_heaviest boolean NOT NULL DEFAULT false,
+  score_by_total_weight boolean NOT NULL DEFAULT true,
+  score_by_longest boolean NOT NULL DEFAULT false,
+  score_by_total_length boolean NOT NULL DEFAULT false,
+
+  -- Separation
+  separate_member_guest_scoring boolean NOT NULL DEFAULT false,
+
+  -- Result counts
+  result_count_weight integer DEFAULT 3,
+  result_count_length integer DEFAULT 3,
+  result_count_count integer DEFAULT 3,
+
+  -- Meta
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_competitions_account ON public.competitions(account_id);
+CREATE INDEX ix_competitions_date ON public.competitions(competition_date DESC);
+
+ALTER TABLE public.competitions ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.competitions FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.competitions TO authenticated;
+GRANT ALL ON public.competitions TO service_role;
+
+CREATE POLICY competitions_select ON public.competitions FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY competitions_insert ON public.competitions FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY competitions_update ON public.competitions FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+CREATE POLICY competitions_delete ON public.competitions FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+CREATE TRIGGER trg_competitions_updated_at
+  BEFORE UPDATE ON public.competitions
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 17. competition_participants (ve_fanglisten_teilnehmer)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.competition_participants (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  competition_id uuid NOT NULL REFERENCES public.competitions(id) ON DELETE CASCADE,
+  member_id uuid REFERENCES public.members(id) ON DELETE SET NULL,
+  category_id uuid REFERENCES public.competition_categories(id) ON DELETE SET NULL,
+
+  -- Guest/external participant info
+  participant_name text NOT NULL,
+  birth_date date,
+  address text,
+  phone text,
+  email text,
+
+  -- Status
+  participated boolean NOT NULL DEFAULT false,
+
+  -- Results (computed from catches)
+  total_catch_count integer NOT NULL DEFAULT 0,
+  total_weight_g integer NOT NULL DEFAULT 0,
+  total_length_cm numeric(8,1) NOT NULL DEFAULT 0,
+  heaviest_catch_g integer NOT NULL DEFAULT 0,
+  longest_catch_cm numeric(5,1) NOT NULL DEFAULT 0,
+
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_competition_participants_competition ON public.competition_participants(competition_id);
+CREATE INDEX ix_competition_participants_member ON public.competition_participants(member_id);
+
+ALTER TABLE public.competition_participants ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.competition_participants FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.competition_participants TO authenticated;
+GRANT ALL ON public.competition_participants TO service_role;
+
+CREATE POLICY competition_participants_select ON public.competition_participants FOR SELECT TO authenticated
+  USING (EXISTS (SELECT 1 FROM public.competitions c WHERE c.id = competition_participants.competition_id AND public.has_role_on_account(c.account_id)));
+CREATE POLICY competition_participants_mutate ON public.competition_participants FOR ALL TO authenticated
+  USING (EXISTS (SELECT 1 FROM public.competitions c WHERE c.id = competition_participants.competition_id AND public.has_permission(auth.uid(), c.account_id, 'fischerei.write'::public.app_permissions)));
+
+-- Add FK from catches to competitions
+ALTER TABLE public.catches
+  ADD CONSTRAINT fk_catches_competition FOREIGN KEY (competition_id) REFERENCES public.competitions(id) ON DELETE SET NULL;
+ALTER TABLE public.catches
+  ADD CONSTRAINT fk_catches_competition_participant FOREIGN KEY (competition_participant_id) REFERENCES public.competition_participants(id) ON DELETE SET NULL;
+
+-- =====================================================
+-- 18. hejfish_sync (integration state tracking)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.hejfish_sync (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  entity_type text NOT NULL, -- 'water', 'species', 'member', 'catch'
+  local_id uuid NOT NULL,
+  hejfish_id text NOT NULL,
+  last_synced_at timestamptz NOT NULL DEFAULT now(),
+  sync_data jsonb,
+  UNIQUE(account_id, entity_type, local_id)
+);
+
+CREATE INDEX ix_hejfish_sync_account ON public.hejfish_sync(account_id);
+CREATE INDEX ix_hejfish_sync_entity ON public.hejfish_sync(entity_type, local_id);
+
+ALTER TABLE public.hejfish_sync ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.hejfish_sync FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.hejfish_sync TO authenticated;
+GRANT ALL ON public.hejfish_sync TO service_role;
+
+CREATE POLICY hejfish_sync_select ON public.hejfish_sync FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY hejfish_sync_mutate ON public.hejfish_sync FOR ALL TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'fischerei.write'::public.app_permissions));
+
+-- =====================================================
+-- 19. Aggregate function for catch statistics
+-- =====================================================
+
+CREATE OR REPLACE FUNCTION public.get_catch_statistics(
+  p_account_id uuid,
+  p_year integer DEFAULT NULL,
+  p_water_id uuid DEFAULT NULL
+)
+RETURNS TABLE(
+  species_id uuid,
+  species_name text,
+  total_count bigint,
+  total_weight_kg numeric,
+  avg_length_cm numeric,
+  avg_weight_g numeric,
+  avg_k_factor numeric
+)
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = ''
+AS $$
+BEGIN
+  RETURN QUERY
+  SELECT
+    c.species_id,
+    fs.name AS species_name,
+    COUNT(*)::bigint AS total_count,
+    ROUND(COALESCE(SUM(c.weight_g) / 1000.0, 0), 2) AS total_weight_kg,
+    ROUND(AVG(c.length_cm), 1) AS avg_length_cm,
+    ROUND(AVG(c.weight_g), 0) AS avg_weight_g,
+    ROUND(AVG(
+      CASE WHEN c.length_cm > 0 AND c.weight_g > 0
+           THEN c.weight_g / POWER(c.length_cm, 3) * 100000
+           ELSE NULL END
+    ), 3) AS avg_k_factor
+  FROM public.catches c
+  JOIN public.catch_books cb ON cb.id = c.catch_book_id
+  JOIN public.fish_species fs ON fs.id = c.species_id
+  WHERE cb.account_id = p_account_id
+    AND (p_year IS NULL OR cb.year = p_year)
+    AND (p_water_id IS NULL OR c.water_id = p_water_id)
+    AND c.is_empty_entry = false
+  GROUP BY c.species_id, fs.name
+  ORDER BY total_count DESC;
+END;
+$$;
+
+GRANT EXECUTE ON FUNCTION public.get_catch_statistics(uuid, integer, uuid)
+  TO authenticated, service_role;
+
+-- =====================================================
+-- 20. Function to compute lease amount for a given year
+-- =====================================================
+
+CREATE OR REPLACE FUNCTION public.compute_lease_amount(
+  p_initial_amount numeric,
+  p_fixed_increase numeric,
+  p_percentage_increase numeric,
+  p_start_year integer,
+  p_target_year integer
+)
+RETURNS numeric
+LANGUAGE plpgsql
+IMMUTABLE
+AS $$
+DECLARE
+  v_amount numeric;
+  v_year_offset integer;
+BEGIN
+  v_year_offset := p_target_year - p_start_year;
+  IF v_year_offset <= 0 THEN
+    RETURN p_initial_amount;
+  END IF;
+
+  IF p_percentage_increase > 0 THEN
+    v_amount := p_initial_amount * POWER(1 + p_percentage_increase / 100.0, v_year_offset);
+  ELSE
+    v_amount := p_initial_amount + (p_fixed_increase * v_year_offset);
+  END IF;
+
+  RETURN ROUND(v_amount, 2);
+END;
+$$;
+
+GRANT EXECUTE ON FUNCTION public.compute_lease_amount(numeric, numeric, numeric, integer, integer)
+  TO authenticated, service_role;
diff --git a/apps/web/supabase/migrations/20260412000002_fischerei_permission_seeds.sql b/apps/web/supabase/migrations/20260412000002_fischerei_permission_seeds.sql
new file mode 100644
index 000000000..9d9741c69
--- /dev/null
+++ b/apps/web/supabase/migrations/20260412000002_fischerei_permission_seeds.sql
@@ -0,0 +1,7 @@
+-- Seed fischerei permissions for existing roles
+
+INSERT INTO public.role_permissions (role, permission) VALUES
+  ('owner', 'fischerei.read'),
+  ('owner', 'fischerei.write'),
+  ('member', 'fischerei.read')
+ON CONFLICT (role, permission) DO NOTHING;
diff --git a/apps/web/supabase/migrations/20260413000001_sitzungsprotokolle.sql b/apps/web/supabase/migrations/20260413000001_sitzungsprotokolle.sql
new file mode 100644
index 000000000..558501a86
--- /dev/null
+++ b/apps/web/supabase/migrations/20260413000001_sitzungsprotokolle.sql
@@ -0,0 +1,224 @@
+/*
+ * -------------------------------------------------------
+ * Sitzungsprotokolle (Meeting Protocols) Schema
+ * Meeting minutes, agenda items, tasks, attachments
+ * -------------------------------------------------------
+ */
+
+-- =====================================================
+-- 1. Extend app_permissions
+-- =====================================================
+
+ALTER TYPE public.app_permissions ADD VALUE IF NOT EXISTS 'meetings.read';
+ALTER TYPE public.app_permissions ADD VALUE IF NOT EXISTS 'meetings.write';
+
+-- =====================================================
+-- 2. Enums
+-- =====================================================
+
+CREATE TYPE public.meeting_item_status AS ENUM(
+  'offen',
+  'in_bearbeitung',
+  'erledigt',
+  'vertagt'
+);
+
+-- =====================================================
+-- 3. meeting_protocols
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.meeting_protocols (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+
+  -- Identity
+  title text NOT NULL,
+  protocol_number text,
+
+  -- Schedule
+  meeting_date date NOT NULL,
+  meeting_time time,
+  end_time time,
+  location text,
+
+  -- Participants
+  chair text,
+  recorder text,
+  attendees jsonb NOT NULL DEFAULT '[]'::jsonb,
+  absent jsonb NOT NULL DEFAULT '[]'::jsonb,
+
+  -- Content
+  summary text,
+
+  -- Status workflow
+  status text NOT NULL DEFAULT 'draft'
+    CHECK (status IN ('draft', 'review', 'approved', 'archived')),
+
+  -- Follow-up
+  next_meeting_date date,
+
+  -- Flags
+  is_archived boolean NOT NULL DEFAULT false,
+
+  -- Meta
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  updated_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_meeting_protocols_account ON public.meeting_protocols(account_id);
+CREATE INDEX ix_meeting_protocols_date ON public.meeting_protocols(account_id, meeting_date DESC);
+CREATE INDEX ix_meeting_protocols_status ON public.meeting_protocols(account_id, status);
+CREATE INDEX ix_meeting_protocols_archived ON public.meeting_protocols(account_id, is_archived);
+
+ALTER TABLE public.meeting_protocols ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.meeting_protocols FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.meeting_protocols TO authenticated;
+GRANT ALL ON public.meeting_protocols TO service_role;
+
+CREATE POLICY meeting_protocols_select ON public.meeting_protocols FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY meeting_protocols_insert ON public.meeting_protocols FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'meetings.write'::public.app_permissions));
+CREATE POLICY meeting_protocols_update ON public.meeting_protocols FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'meetings.write'::public.app_permissions));
+CREATE POLICY meeting_protocols_delete ON public.meeting_protocols FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'meetings.write'::public.app_permissions));
+
+CREATE TRIGGER trg_meeting_protocols_updated_at
+  BEFORE UPDATE ON public.meeting_protocols
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 4. meeting_protocol_items (agenda items / TOPs)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.meeting_protocol_items (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  protocol_id uuid NOT NULL REFERENCES public.meeting_protocols(id) ON DELETE CASCADE,
+
+  -- Ordering
+  item_number integer NOT NULL DEFAULT 0,
+  sort_order integer NOT NULL DEFAULT 0,
+
+  -- Content
+  title text NOT NULL,
+  content text,
+
+  -- Classification
+  item_type text NOT NULL DEFAULT 'information'
+    CHECK (item_type IN ('information', 'discussion', 'decision', 'task')),
+
+  -- Decision tracking
+  decision_text text,
+
+  -- Task tracking
+  status public.meeting_item_status NOT NULL DEFAULT 'offen',
+  responsible_person text,
+  due_date date,
+
+  -- Meta
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_meeting_protocol_items_protocol ON public.meeting_protocol_items(protocol_id);
+CREATE INDEX ix_meeting_protocol_items_status ON public.meeting_protocol_items(status);
+CREATE INDEX ix_meeting_protocol_items_type ON public.meeting_protocol_items(item_type);
+CREATE INDEX ix_meeting_protocol_items_due ON public.meeting_protocol_items(due_date)
+  WHERE due_date IS NOT NULL AND status != 'erledigt';
+
+ALTER TABLE public.meeting_protocol_items ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.meeting_protocol_items FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.meeting_protocol_items TO authenticated;
+GRANT ALL ON public.meeting_protocol_items TO service_role;
+
+CREATE POLICY meeting_protocol_items_select ON public.meeting_protocol_items FOR SELECT TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.meeting_protocols mp
+    WHERE mp.id = meeting_protocol_items.protocol_id
+      AND public.has_role_on_account(mp.account_id)
+  ));
+CREATE POLICY meeting_protocol_items_mutate ON public.meeting_protocol_items FOR ALL TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.meeting_protocols mp
+    WHERE mp.id = meeting_protocol_items.protocol_id
+      AND public.has_permission(auth.uid(), mp.account_id, 'meetings.write'::public.app_permissions)
+  ));
+
+CREATE TRIGGER trg_meeting_protocol_items_updated_at
+  BEFORE UPDATE ON public.meeting_protocol_items
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 5. meeting_protocol_attachments
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.meeting_protocol_attachments (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  protocol_id uuid NOT NULL REFERENCES public.meeting_protocols(id) ON DELETE CASCADE,
+  item_id uuid REFERENCES public.meeting_protocol_items(id) ON DELETE SET NULL,
+
+  -- File info
+  file_name text NOT NULL,
+  file_path text NOT NULL,
+  file_size bigint,
+  content_type text,
+
+  -- Meta
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_meeting_protocol_attachments_protocol ON public.meeting_protocol_attachments(protocol_id);
+CREATE INDEX ix_meeting_protocol_attachments_item ON public.meeting_protocol_attachments(item_id)
+  WHERE item_id IS NOT NULL;
+
+ALTER TABLE public.meeting_protocol_attachments ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.meeting_protocol_attachments FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.meeting_protocol_attachments TO authenticated;
+GRANT ALL ON public.meeting_protocol_attachments TO service_role;
+
+CREATE POLICY meeting_protocol_attachments_select ON public.meeting_protocol_attachments FOR SELECT TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.meeting_protocols mp
+    WHERE mp.id = meeting_protocol_attachments.protocol_id
+      AND public.has_role_on_account(mp.account_id)
+  ));
+CREATE POLICY meeting_protocol_attachments_mutate ON public.meeting_protocol_attachments FOR ALL TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.meeting_protocols mp
+    WHERE mp.id = meeting_protocol_attachments.protocol_id
+      AND public.has_permission(auth.uid(), mp.account_id, 'meetings.write'::public.app_permissions)
+  ));
+
+-- =====================================================
+-- 6. View: open_meeting_tasks
+-- =====================================================
+
+CREATE OR REPLACE VIEW public.open_meeting_tasks AS
+SELECT
+  mpi.id AS item_id,
+  mpi.protocol_id,
+  mp.account_id,
+  mp.title AS protocol_title,
+  mp.meeting_date,
+  mpi.item_number,
+  mpi.title AS task_title,
+  mpi.content AS task_description,
+  mpi.responsible_person,
+  mpi.due_date,
+  mpi.status,
+  CASE
+    WHEN mpi.due_date < current_date AND mpi.status != 'erledigt' THEN true
+    ELSE false
+  END AS is_overdue
+FROM public.meeting_protocol_items mpi
+JOIN public.meeting_protocols mp ON mp.id = mpi.protocol_id
+WHERE mpi.item_type = 'task'
+  AND mpi.status != 'erledigt';
+
+-- Grant access to the view (RLS on underlying tables still applies)
+GRANT SELECT ON public.open_meeting_tasks TO authenticated;
+GRANT SELECT ON public.open_meeting_tasks TO service_role;
diff --git a/apps/web/supabase/migrations/20260413000002_verbandsverwaltung.sql b/apps/web/supabase/migrations/20260413000002_verbandsverwaltung.sql
new file mode 100644
index 000000000..e41624039
--- /dev/null
+++ b/apps/web/supabase/migrations/20260413000002_verbandsverwaltung.sql
@@ -0,0 +1,377 @@
+/*
+ * -------------------------------------------------------
+ * Verbandsverwaltung (Association Management) Schema
+ * Association types, member clubs, contacts, fees,
+ * billing, notes, history
+ * -------------------------------------------------------
+ */
+
+-- =====================================================
+-- 1. Extend app_permissions
+-- =====================================================
+
+ALTER TYPE public.app_permissions ADD VALUE IF NOT EXISTS 'verband.read';
+ALTER TYPE public.app_permissions ADD VALUE IF NOT EXISTS 'verband.write';
+
+-- =====================================================
+-- 2. association_types (Verbandsarten)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.association_types (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  name text NOT NULL,
+  description text,
+  sort_order integer NOT NULL DEFAULT 0,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_association_types_account ON public.association_types(account_id);
+
+ALTER TABLE public.association_types ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.association_types FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.association_types TO authenticated;
+GRANT ALL ON public.association_types TO service_role;
+
+CREATE POLICY association_types_select ON public.association_types FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY association_types_mutate ON public.association_types FOR ALL TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+
+-- =====================================================
+-- 3. member_clubs (Mitgliedsvereine)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.member_clubs (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+
+  -- Identity
+  name text NOT NULL,
+  short_name text,
+  club_number text,
+  association_type_id uuid REFERENCES public.association_types(id) ON DELETE SET NULL,
+
+  -- Contact
+  address_street text,
+  address_zip text,
+  address_city text,
+  phone text,
+  email text,
+  website text,
+
+  -- Bank details
+  iban text,
+  bic text,
+  account_holder text,
+
+  -- Stats
+  member_count integer NOT NULL DEFAULT 0,
+  youth_count integer NOT NULL DEFAULT 0,
+  founding_year integer,
+
+  -- Flags
+  is_active boolean NOT NULL DEFAULT true,
+  is_archived boolean NOT NULL DEFAULT false,
+
+  -- Meta
+  notes text,
+  custom_data jsonb NOT NULL DEFAULT '{}'::jsonb,
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  updated_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_member_clubs_account ON public.member_clubs(account_id);
+CREATE INDEX ix_member_clubs_name ON public.member_clubs(account_id, name);
+CREATE INDEX ix_member_clubs_type ON public.member_clubs(account_id, association_type_id);
+CREATE INDEX ix_member_clubs_active ON public.member_clubs(account_id, is_active);
+CREATE INDEX ix_member_clubs_archived ON public.member_clubs(account_id, is_archived);
+
+ALTER TABLE public.member_clubs ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.member_clubs FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.member_clubs TO authenticated;
+GRANT ALL ON public.member_clubs TO service_role;
+
+CREATE POLICY member_clubs_select ON public.member_clubs FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY member_clubs_insert ON public.member_clubs FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+CREATE POLICY member_clubs_update ON public.member_clubs FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+CREATE POLICY member_clubs_delete ON public.member_clubs FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+
+CREATE TRIGGER trg_member_clubs_updated_at
+  BEFORE UPDATE ON public.member_clubs
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 4. club_roles (Vereinsfunktionen)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.club_roles (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  name text NOT NULL,
+  description text,
+  sort_order integer NOT NULL DEFAULT 0,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_club_roles_account ON public.club_roles(account_id);
+
+ALTER TABLE public.club_roles ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.club_roles FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.club_roles TO authenticated;
+GRANT ALL ON public.club_roles TO service_role;
+
+CREATE POLICY club_roles_select ON public.club_roles FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY club_roles_mutate ON public.club_roles FOR ALL TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+
+-- =====================================================
+-- 5. club_contacts (Ansprechpartner)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.club_contacts (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  club_id uuid NOT NULL REFERENCES public.member_clubs(id) ON DELETE CASCADE,
+  role_id uuid REFERENCES public.club_roles(id) ON DELETE SET NULL,
+
+  -- Person info
+  first_name text NOT NULL,
+  last_name text NOT NULL,
+  email text,
+  phone text,
+  mobile text,
+
+  -- Period
+  valid_from date,
+  valid_until date,
+  is_active boolean NOT NULL DEFAULT true,
+
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_club_contacts_club ON public.club_contacts(club_id);
+CREATE INDEX ix_club_contacts_role ON public.club_contacts(role_id);
+
+ALTER TABLE public.club_contacts ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.club_contacts FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.club_contacts TO authenticated;
+GRANT ALL ON public.club_contacts TO service_role;
+
+CREATE POLICY club_contacts_select ON public.club_contacts FOR SELECT TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.member_clubs mc
+    WHERE mc.id = club_contacts.club_id
+      AND public.has_role_on_account(mc.account_id)
+  ));
+CREATE POLICY club_contacts_mutate ON public.club_contacts FOR ALL TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.member_clubs mc
+    WHERE mc.id = club_contacts.club_id
+      AND public.has_permission(auth.uid(), mc.account_id, 'verband.write'::public.app_permissions)
+  ));
+
+CREATE TRIGGER trg_club_contacts_updated_at
+  BEFORE UPDATE ON public.club_contacts
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 6. club_fee_types (Beitragsarten)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.club_fee_types (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  name text NOT NULL,
+  description text,
+  default_amount numeric(10,2) NOT NULL DEFAULT 0,
+  is_per_member boolean NOT NULL DEFAULT false,
+  is_active boolean NOT NULL DEFAULT true,
+  sort_order integer NOT NULL DEFAULT 0,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_club_fee_types_account ON public.club_fee_types(account_id);
+
+ALTER TABLE public.club_fee_types ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.club_fee_types FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.club_fee_types TO authenticated;
+GRANT ALL ON public.club_fee_types TO service_role;
+
+CREATE POLICY club_fee_types_select ON public.club_fee_types FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY club_fee_types_mutate ON public.club_fee_types FOR ALL TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+
+-- =====================================================
+-- 7. club_fee_billings (Beitragsabrechnungen)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.club_fee_billings (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  club_id uuid NOT NULL REFERENCES public.member_clubs(id) ON DELETE CASCADE,
+  fee_type_id uuid NOT NULL REFERENCES public.club_fee_types(id) ON DELETE RESTRICT,
+
+  -- Billing period
+  billing_year integer NOT NULL,
+  billing_period text DEFAULT 'annual'
+    CHECK (billing_period IN ('annual', 'semi_annual', 'quarterly')),
+
+  -- Amounts
+  amount numeric(10,2) NOT NULL DEFAULT 0,
+  member_count_at_billing integer,
+
+  -- Payment tracking
+  status text NOT NULL DEFAULT 'open'
+    CHECK (status IN ('open', 'invoiced', 'paid', 'overdue', 'cancelled')),
+  invoice_number text,
+  invoice_date date,
+  paid_date date,
+  paid_amount numeric(10,2),
+
+  remarks text,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_club_fee_billings_club ON public.club_fee_billings(club_id);
+CREATE INDEX ix_club_fee_billings_fee_type ON public.club_fee_billings(fee_type_id);
+CREATE INDEX ix_club_fee_billings_year ON public.club_fee_billings(billing_year);
+CREATE INDEX ix_club_fee_billings_status ON public.club_fee_billings(status);
+
+ALTER TABLE public.club_fee_billings ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.club_fee_billings FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.club_fee_billings TO authenticated;
+GRANT ALL ON public.club_fee_billings TO service_role;
+
+CREATE POLICY club_fee_billings_select ON public.club_fee_billings FOR SELECT TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.member_clubs mc
+    WHERE mc.id = club_fee_billings.club_id
+      AND public.has_role_on_account(mc.account_id)
+  ));
+CREATE POLICY club_fee_billings_mutate ON public.club_fee_billings FOR ALL TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.member_clubs mc
+    WHERE mc.id = club_fee_billings.club_id
+      AND public.has_permission(auth.uid(), mc.account_id, 'verband.write'::public.app_permissions)
+  ));
+
+CREATE TRIGGER trg_club_fee_billings_updated_at
+  BEFORE UPDATE ON public.club_fee_billings
+  FOR EACH ROW EXECUTE FUNCTION public.update_account_settings_timestamp();
+
+-- =====================================================
+-- 8. club_notes (Vereinsnotizen)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.club_notes (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  club_id uuid NOT NULL REFERENCES public.member_clubs(id) ON DELETE CASCADE,
+  title text,
+  content text NOT NULL,
+  note_date date NOT NULL DEFAULT current_date,
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_club_notes_club ON public.club_notes(club_id);
+CREATE INDEX ix_club_notes_date ON public.club_notes(note_date DESC);
+
+ALTER TABLE public.club_notes ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.club_notes FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.club_notes TO authenticated;
+GRANT ALL ON public.club_notes TO service_role;
+
+CREATE POLICY club_notes_select ON public.club_notes FOR SELECT TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.member_clubs mc
+    WHERE mc.id = club_notes.club_id
+      AND public.has_role_on_account(mc.account_id)
+  ));
+CREATE POLICY club_notes_mutate ON public.club_notes FOR ALL TO authenticated
+  USING (EXISTS (
+    SELECT 1 FROM public.member_clubs mc
+    WHERE mc.id = club_notes.club_id
+      AND public.has_permission(auth.uid(), mc.account_id, 'verband.write'::public.app_permissions)
+  ));
+
+-- =====================================================
+-- 9. association_history (Verbandschronik)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS public.association_history (
+  id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+  account_id uuid NOT NULL REFERENCES public.accounts(id) ON DELETE CASCADE,
+  club_id uuid REFERENCES public.member_clubs(id) ON DELETE SET NULL,
+
+  -- Event
+  event_type text NOT NULL DEFAULT 'note'
+    CHECK (event_type IN ('joined', 'left', 'name_change', 'merge', 'split', 'status_change', 'note')),
+  event_date date NOT NULL DEFAULT current_date,
+  description text NOT NULL,
+
+  -- Metadata
+  old_value text,
+  new_value text,
+
+  created_by uuid REFERENCES auth.users(id) ON DELETE SET NULL,
+  created_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_association_history_account ON public.association_history(account_id);
+CREATE INDEX ix_association_history_club ON public.association_history(club_id);
+CREATE INDEX ix_association_history_date ON public.association_history(event_date DESC);
+CREATE INDEX ix_association_history_type ON public.association_history(event_type);
+
+ALTER TABLE public.association_history ENABLE ROW LEVEL SECURITY;
+REVOKE ALL ON public.association_history FROM authenticated, service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.association_history TO authenticated;
+GRANT ALL ON public.association_history TO service_role;
+
+CREATE POLICY association_history_select ON public.association_history FOR SELECT TO authenticated
+  USING (public.has_role_on_account(account_id));
+CREATE POLICY association_history_insert ON public.association_history FOR INSERT TO authenticated
+  WITH CHECK (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+CREATE POLICY association_history_update ON public.association_history FOR UPDATE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+CREATE POLICY association_history_delete ON public.association_history FOR DELETE TO authenticated
+  USING (public.has_permission(auth.uid(), account_id, 'verband.write'::public.app_permissions));
+
+-- =====================================================
+-- 10. Dashboard stats RPC
+-- =====================================================
+
+CREATE OR REPLACE FUNCTION public.get_verband_dashboard_stats(p_account_id uuid)
+RETURNS TABLE(
+  total_clubs bigint,
+  active_clubs bigint,
+  total_members bigint,
+  total_youth bigint,
+  open_fees bigint,
+  open_fees_amount numeric
+)
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = ''
+AS $$
+BEGIN
+  RETURN QUERY
+  SELECT
+    (SELECT COUNT(*) FROM public.member_clubs WHERE account_id = p_account_id AND is_archived = false)::bigint AS total_clubs,
+    (SELECT COUNT(*) FROM public.member_clubs WHERE account_id = p_account_id AND is_active = true AND is_archived = false)::bigint AS active_clubs,
+    (SELECT COALESCE(SUM(member_count), 0) FROM public.member_clubs WHERE account_id = p_account_id AND is_archived = false)::bigint AS total_members,
+    (SELECT COALESCE(SUM(youth_count), 0) FROM public.member_clubs WHERE account_id = p_account_id AND is_archived = false)::bigint AS total_youth,
+    (SELECT COUNT(*) FROM public.club_fee_billings cfb JOIN public.member_clubs mc ON mc.id = cfb.club_id WHERE mc.account_id = p_account_id AND cfb.status IN ('open', 'overdue'))::bigint AS open_fees,
+    (SELECT COALESCE(SUM(cfb.amount), 0) FROM public.club_fee_billings cfb JOIN public.member_clubs mc ON mc.id = cfb.club_id WHERE mc.account_id = p_account_id AND cfb.status IN ('open', 'overdue'))::numeric AS open_fees_amount;
+END;
+$$;
+
+GRANT EXECUTE ON FUNCTION public.get_verband_dashboard_stats(uuid) TO authenticated, service_role;
diff --git a/apps/web/supabase/migrations/20260413000003_universal_permission_seeds.sql b/apps/web/supabase/migrations/20260413000003_universal_permission_seeds.sql
new file mode 100644
index 000000000..d277e8c4b
--- /dev/null
+++ b/apps/web/supabase/migrations/20260413000003_universal_permission_seeds.sql
@@ -0,0 +1,10 @@
+-- Seed meetings + verband permissions for existing roles
+
+INSERT INTO public.role_permissions (role, permission) VALUES
+  ('owner', 'meetings.read'),
+  ('owner', 'meetings.write'),
+  ('member', 'meetings.read'),
+  ('owner', 'verband.read'),
+  ('owner', 'verband.write'),
+  ('member', 'verband.read')
+ON CONFLICT (role, permission) DO NOTHING;
diff --git a/docker-compose.yml b/docker-compose.yml
index 68bef5333..5b180200f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,30 +1,65 @@
-version: '3.8'
-
-# MyEasyCMS v2 — Docker Compose for Dokploy deployment
-# Supabase (self-hosted) + Next.js app
+# MyEasyCMS v2 — Docker Compose for Production / Dokploy
+#
+# Equivalent to `supabase start` but portable for self-hosted deployment.
+# For local development, use `pnpm supabase:web:start` instead.
+#
+# ⚠️  First deploy: `docker compose up -d` creates the DB from scratch with
+#     all Supabase roles/schemas via the image's built-in init scripts, then
+#     runs app migrations from the mounted volume.
 
 services:
   # =====================================================
-  # Supabase Stack
+  # Supabase Postgres
   # =====================================================
-  
   supabase-db:
     image: supabase/postgres:15.8.1.060
     restart: unless-stopped
     volumes:
       - supabase-db-data:/var/lib/postgresql/data
-      - ./apps/web/supabase/migrations:/docker-entrypoint-initdb.d/migrations
+      # Post-migration hook: sets passwords on all Supabase roles AFTER
+      # migrate.sh creates them. 'zzz-' prefix ensures it runs last.
+      - ./docker/db/zzz-role-passwords.sh:/docker-entrypoint-initdb.d/zzz-role-passwords.sh:ro
+      # App migrations — mounted to a separate path (NOT /docker-entrypoint-initdb.d/migrations!)
+      - ./apps/web/supabase/migrations:/app-migrations:ro
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-your-super-secret-password}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: postgres
     ports:
-      - "5432:5432"
+      - "${DB_PORT:-5432}:5432"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
       interval: 10s
       timeout: 5s
-      retries: 5
+      retries: 10
 
+  # Run app migrations, seed, and dev patches after DB is healthy
+  supabase-db-migrate:
+    image: supabase/postgres:15.8.1.060
+    depends_on:
+      supabase-db:
+        condition: service_healthy
+    volumes:
+      - ./apps/web/supabase/migrations:/app-migrations:ro
+      - ./apps/web/supabase/seed.sql:/app-seed/seed.sql:ro
+      - ./docker/db/dev-bootstrap.sh:/app-seed/dev-bootstrap.sh:ro
+    environment:
+      PGPASSWORD: ${POSTGRES_PASSWORD}
+    entrypoint: ["/bin/sh", "-c"]
+    command:
+      - |
+        echo "Running app migrations..."
+        for sql in /app-migrations/*.sql; do
+          echo "  → $$sql"
+          psql -h supabase-db -U supabase_admin -d postgres -v ON_ERROR_STOP=0 -f "$$sql" 2>&1 || true
+        done
+        echo "✅ App migrations complete."
+        echo ""
+        sh /app-seed/dev-bootstrap.sh
+    restart: "no"
+
+  # =====================================================
+  # Supabase Auth (GoTrue)
+  # =====================================================
   supabase-auth:
     image: supabase/gotrue:v2.172.1
     restart: unless-stopped
@@ -36,7 +71,7 @@ services:
       GOTRUE_API_PORT: 9999
       API_EXTERNAL_URL: ${API_EXTERNAL_URL:-http://localhost:8000}
       GOTRUE_DB_DRIVER: postgres
-      GOTRUE_DB_DATABASE_URL: postgres://postgres:${POSTGRES_PASSWORD:-your-super-secret-password}@supabase-db:5432/postgres?search_path=auth
+      GOTRUE_DB_DATABASE_URL: postgres://supabase_auth_admin:${POSTGRES_PASSWORD}@supabase-db:5432/postgres?search_path=auth
       GOTRUE_SITE_URL: ${SITE_URL:-https://myeasycms.de}
       GOTRUE_URI_ALLOW_LIST: ${ADDITIONAL_REDIRECT_URLS:-}
       GOTRUE_DISABLE_SIGNUP: ${DISABLE_SIGNUP:-false}
@@ -44,7 +79,7 @@ services:
       GOTRUE_JWT_AUD: authenticated
       GOTRUE_JWT_DEFAULT_GROUP_NAME: authenticated
       GOTRUE_JWT_EXP: ${JWT_EXPIRY:-3600}
-      GOTRUE_JWT_SECRET: ${JWT_SECRET:-your-super-secret-jwt-token-with-at-least-32-characters}
+      GOTRUE_JWT_SECRET: ${JWT_SECRET}
       GOTRUE_EXTERNAL_EMAIL_ENABLED: true
       GOTRUE_MAILER_AUTOCONFIRM: ${ENABLE_EMAIL_AUTOCONFIRM:-false}
       GOTRUE_SMTP_HOST: ${SMTP_HOST:-}
@@ -56,7 +91,15 @@ services:
       GOTRUE_MAILER_URLPATHS_CONFIRMATION: /auth/v1/verify
       GOTRUE_MAILER_URLPATHS_RECOVERY: /auth/v1/verify
       GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE: /auth/v1/verify
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:9999/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
+  # =====================================================
+  # Supabase REST (PostgREST)
+  # =====================================================
   supabase-rest:
     image: postgrest/postgrest:v12.2.8
     restart: unless-stopped
@@ -64,33 +107,155 @@ services:
       supabase-db:
         condition: service_healthy
     environment:
-      PGRST_DB_URI: postgres://authenticator:${POSTGRES_PASSWORD:-your-super-secret-password}@supabase-db:5432/postgres
+      PGRST_DB_URI: postgres://authenticator:${POSTGRES_PASSWORD}@supabase-db:5432/postgres
       PGRST_DB_SCHEMAS: public,storage,graphql_public
       PGRST_DB_ANON_ROLE: anon
-      PGRST_JWT_SECRET: ${JWT_SECRET:-your-super-secret-jwt-token-with-at-least-32-characters}
+      PGRST_JWT_SECRET: ${JWT_SECRET}
       PGRST_DB_USE_LEGACY_GUCS: "false"
+    healthcheck:
+      test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3000/ || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
+  # =====================================================
+  # Supabase Realtime
+  # =====================================================
+  supabase-realtime:
+    image: supabase/realtime:v2.33.70
+    restart: unless-stopped
+    depends_on:
+      supabase-db:
+        condition: service_healthy
+    environment:
+      PORT: 4000
+      DB_HOST: supabase-db
+      DB_PORT: 5432
+      DB_USER: supabase_admin
+      DB_PASSWORD: ${POSTGRES_PASSWORD}
+      DB_NAME: postgres
+      DB_AFTER_CONNECT_QUERY: "SET search_path TO _realtime"
+      DB_ENC_KEY: supabaserealtime
+      API_JWT_SECRET: ${JWT_SECRET}
+      SECRET_KEY_BASE: ${SECRET_KEY_BASE:-UpNVntn3cDxHJpq99YMc1T1AQgQpc8kfYTuRgBiYa15BLrx8etQoXz3gZv1/u2oq}
+      ERL_AFLAGS: "-proto_dist inet_tcp"
+      DNS_NODES: "''"
+      RLIMIT_NOFILE: "10000"
+      APP_NAME: realtime
+      SEED_SELF_HOST: "true"
+      REPLICATION_MODE: RLS
+      REPLICATION_POLL_INTERVAL: 100
+      SECURE_CHANNELS: "true"
+      SLOT_NAME: supabase_realtime_rls
+      TEMPORARY_SLOT: "true"
+      MAX_RECORD_BYTES: 1048576
+
+  # =====================================================
+  # Supabase Storage
+  # =====================================================
   supabase-storage:
     image: supabase/storage-api:v1.22.7
     restart: unless-stopped
     depends_on:
       supabase-db:
         condition: service_healthy
+      supabase-rest:
+        condition: service_started
+      supabase-imgproxy:
+        condition: service_started
     volumes:
       - supabase-storage-data:/var/lib/storage
     environment:
       ANON_KEY: ${SUPABASE_ANON_KEY}
       SERVICE_KEY: ${SUPABASE_SERVICE_ROLE_KEY}
       POSTGREST_URL: http://supabase-rest:3000
-      PGRST_JWT_SECRET: ${JWT_SECRET:-your-super-secret-jwt-token-with-at-least-32-characters}
-      DATABASE_URL: postgres://supabase_storage_admin:${POSTGRES_PASSWORD:-your-super-secret-password}@supabase-db:5432/postgres
+      PGRST_JWT_SECRET: ${JWT_SECRET}
+      DATABASE_URL: postgres://supabase_storage_admin:${POSTGRES_PASSWORD}@supabase-db:5432/postgres
       FILE_SIZE_LIMIT: 52428800
       STORAGE_BACKEND: file
       FILE_STORAGE_BACKEND_PATH: /var/lib/storage
       TENANT_ID: stub
       REGION: local
       GLOBAL_S3_BUCKET: stub
+      IMGPROXY_URL: http://supabase-imgproxy:8080
+    healthcheck:
+      test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:5000/status || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
+  # =====================================================
+  # Supabase imgproxy (image transformations)
+  # =====================================================
+  supabase-imgproxy:
+    image: darthsim/imgproxy:v3.8.0
+    restart: unless-stopped
+    environment:
+      IMGPROXY_BIND: ":8080"
+      IMGPROXY_LOCAL_FILESYSTEM_ROOT: /
+      IMGPROXY_USE_ETAG: "true"
+      IMGPROXY_ENABLE_WEBP_DETECTION: "true"
+
+  # =====================================================
+  # Supabase pg_meta (DB introspection for Studio)
+  # =====================================================
+  supabase-meta:
+    image: supabase/postgres-meta:v0.84.2
+    restart: unless-stopped
+    depends_on:
+      supabase-db:
+        condition: service_healthy
+    environment:
+      PG_META_PORT: 8080
+      PG_META_DB_HOST: supabase-db
+      PG_META_DB_PORT: 5432
+      PG_META_DB_NAME: postgres
+      PG_META_DB_USER: supabase_admin
+      PG_META_DB_PASSWORD: ${POSTGRES_PASSWORD}
+
+  # =====================================================
+  # Supabase Studio (Dashboard)
+  # =====================================================
+  supabase-studio:
+    image: supabase/studio:latest
+    restart: unless-stopped
+    depends_on:
+      - supabase-meta
+      - supabase-kong
+    ports:
+      - "${STUDIO_PORT:-54323}:3000"
+    environment:
+      STUDIO_PG_META_URL: http://supabase-meta:8080
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      DEFAULT_ORGANIZATION_NAME: MyEasyCMS
+      DEFAULT_PROJECT_NAME: MyEasyCMS v2
+      SUPABASE_URL: http://supabase-kong:8000
+      SUPABASE_PUBLIC_URL: ${API_EXTERNAL_URL:-http://localhost:8000}
+      SUPABASE_ANON_KEY: ${SUPABASE_ANON_KEY}
+      SUPABASE_SERVICE_KEY: ${SUPABASE_SERVICE_ROLE_KEY}
+      AUTH_JWT_SECRET: ${JWT_SECRET}
+      NEXT_PUBLIC_ENABLE_LOGS: "true"
+      NEXT_ANALYTICS_BACKEND_PROVIDER: postgres
+    healthcheck:
+      test: ["CMD", "node", "-e", "require('http').get('http://localhost:3000/api/profile', (r) => r.statusCode === 200 ? process.exit(0) : process.exit(1))"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  # =====================================================
+  # Supabase Inbucket (Email testing)
+  # =====================================================
+  supabase-inbucket:
+    image: inbucket/inbucket:3.0.4
+    restart: unless-stopped
+    ports:
+      - "${INBUCKET_PORT:-54324}:9000"
+    volumes:
+      - supabase-inbucket-data:/storage
+
+  # =====================================================
+  # Supabase Kong (API Gateway)
+  # =====================================================
   supabase-kong:
     image: kong:2.8.1
     restart: unless-stopped
@@ -98,9 +263,13 @@ services:
       - supabase-auth
       - supabase-rest
       - supabase-storage
+      - supabase-realtime
     ports:
       - "${KONG_HTTP_PORT:-8000}:8000"
       - "${KONG_HTTPS_PORT:-8443}:8443"
+      - "${APP_PORT:-3000}:3000"
+    entrypoint: >
+      sh -c "sed 's|\$${SUPABASE_ANON_KEY}|'\"$$SUPABASE_ANON_KEY\"'|g; s|\$${SUPABASE_SERVICE_KEY}|'\"$$SUPABASE_SERVICE_KEY\"'|g' /var/lib/kong/kong.yml.tpl > /tmp/kong.yml && KONG_DECLARATIVE_CONFIG=/tmp/kong.yml /docker-entrypoint.sh kong docker-start"
     environment:
       KONG_DATABASE: "off"
       KONG_DECLARATIVE_CONFIG: /var/lib/kong/kong.yml
@@ -111,28 +280,38 @@ services:
       SUPABASE_ANON_KEY: ${SUPABASE_ANON_KEY}
       SUPABASE_SERVICE_KEY: ${SUPABASE_SERVICE_ROLE_KEY}
     volumes:
-      - ./docker/kong.yml:/var/lib/kong/kong.yml:ro
+      - ./docker/kong.yml:/var/lib/kong/kong.yml.tpl:ro
+    healthcheck:
+      test: ["CMD", "kong", "health"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   # =====================================================
   # Next.js App
   # =====================================================
-  
   app:
     build:
       context: .
       dockerfile: Dockerfile
     restart: unless-stopped
     depends_on:
-      - supabase-kong
-    ports:
-      - "${APP_PORT:-3000}:3000"
+      supabase-kong:
+        condition: service_healthy
+      supabase-db-migrate:
+        condition: service_completed_successfully
+    # App shares Kong's network namespace — localhost:8000 inside the container
+    # reaches Kong directly. This keeps the same URL for browser AND server,
+    # so Supabase cookie names match without any code changes.
+    network_mode: "service:supabase-kong"
     environment:
       NODE_ENV: production
-      NEXT_PUBLIC_SITE_URL: ${SITE_URL:-https://myeasycms.de}
-      NEXT_PUBLIC_SUPABASE_URL: http://supabase-kong:8000
+      NEXT_PUBLIC_SITE_URL: ${SITE_URL:-http://localhost:3000}
+      NEXT_PUBLIC_SUPABASE_URL: http://localhost:8000
       NEXT_PUBLIC_SUPABASE_PUBLIC_KEY: ${SUPABASE_ANON_KEY}
       SUPABASE_SECRET_KEY: ${SUPABASE_SERVICE_ROLE_KEY}
       SUPABASE_DB_WEBHOOK_SECRET: ${DB_WEBHOOK_SECRET:-webhooksecret}
+      EMAIL_SENDER: ${EMAIL_SENDER:-noreply@myeasycms.de}
       NEXT_PUBLIC_PRODUCT_NAME: MyEasyCMS
       NEXT_PUBLIC_DEFAULT_LOCALE: de
       NEXT_PUBLIC_ENABLE_THEME_TOGGLE: "true"
@@ -145,3 +324,4 @@ services:
 volumes:
   supabase-db-data:
   supabase-storage-data:
+  supabase-inbucket-data:
diff --git a/docker/db/dev-bootstrap.sh b/docker/db/dev-bootstrap.sh
new file mode 100755
index 000000000..18f7a9d6c
--- /dev/null
+++ b/docker/db/dev-bootstrap.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+set -e
+
+# ===========================================================================
+# Docker dev bootstrap — runs AFTER app migrations
+# Seeds the DB, removes MFA, patches is_super_admin for local dev (no aal2).
+# ===========================================================================
+
+PSQL="psql -v ON_ERROR_STOP=0 --no-password --no-psqlrc -U supabase_admin -d postgres -h supabase-db"
+
+echo "🌱 Running seed.sql..."
+$PSQL -f /app-seed/seed.sql 2>&1 || true
+
+echo "🔓 Removing MFA factors for dev..."
+$PSQL -c "DELETE FROM auth.mfa_factors;" 2>&1 || true
+$PSQL -c "DELETE FROM auth.mfa_challenges;" 2>&1 || true
+
+echo "🔄 Fixing auth sequences after seed import..."
+$PSQL -c "SELECT setval('auth.refresh_tokens_id_seq', (SELECT COALESCE(MAX(id), 0) + 1 FROM auth.refresh_tokens));" 2>&1 || true
+$PSQL -c "SELECT setval(pg_get_serial_sequence('public.role_permissions', 'id'), (SELECT COALESCE(MAX(id), 0) + 1 FROM public.role_permissions));" 2>&1 || true
+
+echo "🔧 Patching is_super_admin() — skip aal2 for local dev..."
+cat <<'EOSQL' | $PSQL
+CREATE OR REPLACE FUNCTION public.is_super_admin() RETURNS boolean
+LANGUAGE plpgsql SECURITY DEFINER AS $fn$
+declare r boolean;
+begin
+  select (auth.jwt() ->> 'app_metadata')::jsonb ->> 'role' = 'super-admin' into r;
+  return coalesce(r, false);
+end $fn$;
+EOSQL
+
+echo "🌐 Adding anon read policy for public club pages..."
+$PSQL -c "DO \$\$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_policy WHERE polname = 'accounts_public_read') THEN
+    CREATE POLICY accounts_public_read ON public.accounts FOR SELECT TO anon
+    USING (is_personal_account = false AND id IN (SELECT account_id FROM public.site_settings WHERE is_public = true));
+  END IF;
+  IF NOT EXISTS (SELECT 1 FROM pg_policy WHERE polname = 'events_public_read') THEN
+    CREATE POLICY events_public_read ON public.events FOR SELECT TO anon
+    USING (account_id IN (SELECT account_id FROM public.site_settings WHERE is_public = true));
+  END IF;
+  IF NOT EXISTS (SELECT 1 FROM pg_policy WHERE polname = 'courses_public_read') THEN
+    CREATE POLICY courses_public_read ON public.courses FOR SELECT TO anon
+    USING (account_id IN (SELECT account_id FROM public.site_settings WHERE is_public = true));
+  END IF;
+END \$\$;" 2>&1 || true
+$PSQL -c "GRANT SELECT ON public.events TO anon;" 2>&1 || true
+$PSQL -c "GRANT SELECT ON public.courses TO anon;" 2>&1 || true
+
+echo "✅ Dev bootstrap complete."
diff --git a/docker/db/zzz-role-passwords.sh b/docker/db/zzz-role-passwords.sh
new file mode 100755
index 000000000..e00420c97
--- /dev/null
+++ b/docker/db/zzz-role-passwords.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+
+# ===========================================================================
+# Supabase role password bootstrap
+# 
+# Runs AFTER migrate.sh (zzz- prefix ensures alphabetical ordering).
+# By this point all roles exist (created by init-scripts/00000000000000-initial-schema.sql).
+# Sets passwords so PostgREST, Storage, Auth, and Studio can connect via TCP.
+# ===========================================================================
+
+psql -v ON_ERROR_STOP=1 --no-password --no-psqlrc -U supabase_admin -d postgres <<-EOSQL
+  -- PostgREST connects as authenticator
+  ALTER ROLE authenticator WITH LOGIN PASSWORD '${POSTGRES_PASSWORD}';
+
+  -- Storage API connects as supabase_storage_admin
+  ALTER ROLE supabase_storage_admin WITH LOGIN PASSWORD '${POSTGRES_PASSWORD}';
+
+  -- GoTrue (Auth) connects as supabase_auth_admin
+  ALTER ROLE supabase_auth_admin WITH LOGIN PASSWORD '${POSTGRES_PASSWORD}';
+
+  -- Studio / pg_meta connects as dashboard_user
+  ALTER ROLE dashboard_user WITH LOGIN PASSWORD '${POSTGRES_PASSWORD}';
+
+  -- postgres (created by migrate.sh, needs password for TCP auth)
+  ALTER ROLE postgres WITH PASSWORD '${POSTGRES_PASSWORD}';
+
+  -- Realtime needs the _realtime schema
+  CREATE SCHEMA IF NOT EXISTS _realtime;
+  GRANT ALL ON SCHEMA _realtime TO supabase_admin;
+  GRANT USAGE ON SCHEMA _realtime TO postgres, anon, authenticated, service_role;
+EOSQL
+
+echo "✅ All Supabase role passwords set successfully."
diff --git a/docker/kong.yml b/docker/kong.yml
index 9b6cde544..b8953e7ea 100644
--- a/docker/kong.yml
+++ b/docker/kong.yml
@@ -46,6 +46,17 @@ services:
             - anon
             - admin
 
+  # Realtime
+  - name: realtime-v1
+    url: http://supabase-realtime:4000/socket/
+    routes:
+      - name: realtime-v1-routes
+        strip_path: true
+        paths:
+          - /realtime/v1/
+    plugins:
+      - name: cors
+
   # Storage
   - name: storage-v1
     url: http://supabase-storage:5000/
@@ -56,3 +67,21 @@ services:
           - /storage/v1/
     plugins:
       - name: cors
+
+  # pg_meta
+  - name: meta
+    url: http://supabase-meta:8080/
+    routes:
+      - name: meta-routes
+        strip_path: true
+        paths:
+          - /pg/
+    plugins:
+      - name: key-auth
+        config:
+          hide_credentials: false
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
diff --git a/packages/features/auth/src/components/password-input.tsx b/packages/features/auth/src/components/password-input.tsx
index dedf56c35..c67acdf2d 100644
--- a/packages/features/auth/src/components/password-input.tsx
+++ b/packages/features/auth/src/components/password-input.tsx
@@ -24,6 +24,7 @@ export function PasswordInput(props: React.ComponentProps<'input'>) {
         data-test="password-input"
         type={showPassword ? 'text' : 'password'}
         placeholder={'************'}
+        required
         {...props}
       />
 
diff --git a/packages/features/course-management/src/components/create-course-form.tsx b/packages/features/course-management/src/components/create-course-form.tsx
index 75ae980b9..cd0def0ba 100644
--- a/packages/features/course-management/src/components/create-course-form.tsx
+++ b/packages/features/course-management/src/components/create-course-form.tsx
@@ -42,7 +42,7 @@ export function CreateCourseForm({ accountId, account }: Props) {
     onSuccess: ({ data }) => {
       if (data?.success) {
         toast.success('Kurs erfolgreich erstellt');
-        router.push(`/home/${account}/courses-cms`);
+        router.push(`/home/${account}/courses`);
       }
     },
     onError: ({ error }) => {
diff --git a/packages/features/event-management/src/components/create-event-form.tsx b/packages/features/event-management/src/components/create-event-form.tsx
index bdcd42098..a2d9137c4 100644
--- a/packages/features/event-management/src/components/create-event-form.tsx
+++ b/packages/features/event-management/src/components/create-event-form.tsx
@@ -45,7 +45,7 @@ export function CreateEventForm({ accountId, account }: Props) {
     onSuccess: ({ data }) => {
       if (data?.success) {
         toast.success('Veranstaltung erfolgreich erstellt');
-        router.push(`/home/${account}/events-cms`);
+        router.push(`/home/${account}/events`);
       }
     },
     onError: ({ error }) => {
diff --git a/packages/features/event-management/src/server/api.ts b/packages/features/event-management/src/server/api.ts
index 953eab97f..77597603d 100644
--- a/packages/features/event-management/src/server/api.ts
+++ b/packages/features/event-management/src/server/api.ts
@@ -6,6 +6,7 @@ import type { CreateEventInput } from '../schema/event.schema';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 export function createEventManagementApi(client: SupabaseClient<Database>) {
+  const PAGE_SIZE = 25;
   const db = client;
 
   return {
@@ -14,10 +15,28 @@ export function createEventManagementApi(client: SupabaseClient<Database>) {
         .eq('account_id', accountId).order('event_date', { ascending: false });
       if (opts?.status) query = query.eq('status', opts.status);
       const page = opts?.page ?? 1;
-      query = query.range((page - 1) * 25, page * 25 - 1);
+      query = query.range((page - 1) * PAGE_SIZE, page * PAGE_SIZE - 1);
       const { data, error, count } = await query;
       if (error) throw error;
-      return { data: data ?? [], total: count ?? 0 };
+      const total = count ?? 0;
+      return { data: data ?? [], total, page, pageSize: PAGE_SIZE, totalPages: Math.max(1, Math.ceil(total / PAGE_SIZE)) };
+    },
+
+    async getRegistrationCounts(eventIds: string[]) {
+      if (eventIds.length === 0) return {} as Record<string, number>;
+      const { data, error } = await client
+        .from('event_registrations')
+        .select('event_id', { count: 'exact', head: false })
+        .in('event_id', eventIds)
+        .in('status', ['pending', 'confirmed']);
+      if (error) throw error;
+
+      const counts: Record<string, number> = {};
+      for (const row of data ?? []) {
+        const eid = (row as Record<string, unknown>).event_id as string;
+        counts[eid] = (counts[eid] ?? 0) + 1;
+      }
+      return counts;
     },
 
     async getEvent(eventId: string) {
diff --git a/packages/features/fischerei/package.json b/packages/features/fischerei/package.json
new file mode 100644
index 000000000..c3c3d0eaa
--- /dev/null
+++ b/packages/features/fischerei/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "@kit/fischerei",
+  "version": "0.1.0",
+  "private": true,
+  "typesVersions": {
+    "*": {
+      "*": [
+        "src/*"
+      ]
+    }
+  },
+  "exports": {
+    "./api": "./src/server/api.ts",
+    "./schema/*": "./src/schema/*.ts",
+    "./components": "./src/components/index.ts",
+    "./actions/*": "./src/server/actions/*.ts",
+    "./lib/*": "./src/lib/*.ts"
+  },
+  "scripts": {
+    "clean": "git clean -xdf .turbo node_modules",
+    "typecheck": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "@hookform/resolvers": "catalog:",
+    "@kit/next": "workspace:*",
+    "@kit/shared": "workspace:*",
+    "@kit/supabase": "workspace:*",
+    "@kit/tsconfig": "workspace:*",
+    "@kit/ui": "workspace:*",
+    "@supabase/supabase-js": "catalog:",
+    "@types/react": "catalog:",
+    "lucide-react": "catalog:",
+    "next": "catalog:",
+    "next-safe-action": "catalog:",
+    "react": "catalog:",
+    "react-hook-form": "catalog:",
+    "recharts": "catalog:",
+    "zod": "catalog:"
+  }
+}
diff --git a/packages/features/fischerei/src/components/catch-books-data-table.tsx b/packages/features/fischerei/src/components/catch-books-data-table.tsx
new file mode 100644
index 000000000..df40f972c
--- /dev/null
+++ b/packages/features/fischerei/src/components/catch-books-data-table.tsx
@@ -0,0 +1,212 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useRouter, useSearchParams } from 'next/navigation';
+
+import { Check } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+import {
+  CATCH_BOOK_STATUS_LABELS,
+  CATCH_BOOK_STATUS_COLORS,
+} from '../lib/fischerei-constants';
+
+interface CatchBooksDataTableProps {
+  data: Array<Record<string, unknown>>;
+  total: number;
+  page: number;
+  pageSize: number;
+  account: string;
+}
+
+const STATUS_OPTIONS = [
+  { value: '', label: 'Alle Status' },
+  { value: 'offen', label: 'Offen' },
+  { value: 'eingereicht', label: 'Eingereicht' },
+  { value: 'geprueft', label: 'Geprüft' },
+  { value: 'akzeptiert', label: 'Akzeptiert' },
+  { value: 'abgelehnt', label: 'Abgelehnt' },
+] as const;
+
+export function CatchBooksDataTable({
+  data,
+  total,
+  page,
+  pageSize,
+  account,
+}: CatchBooksDataTableProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const currentYear = searchParams.get('year') ?? '';
+  const currentStatus = searchParams.get('status') ?? '';
+  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+
+  const updateParams = useCallback(
+    (updates: Record<string, string>) => {
+      const params = new URLSearchParams(searchParams.toString());
+      for (const [key, value] of Object.entries(updates)) {
+        if (value) {
+          params.set(key, value);
+        } else {
+          params.delete(key);
+        }
+      }
+      if (!('page' in updates)) params.delete('page');
+      router.push(`?${params.toString()}`);
+    },
+    [router, searchParams],
+  );
+
+  const handleYearChange = useCallback(
+    (e: React.ChangeEvent<HTMLSelectElement>) => {
+      updateParams({ year: e.target.value });
+    },
+    [updateParams],
+  );
+
+  const handleStatusChange = useCallback(
+    (e: React.ChangeEvent<HTMLSelectElement>) => {
+      updateParams({ status: e.target.value });
+    },
+    [updateParams],
+  );
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      updateParams({ page: String(newPage) });
+    },
+    [updateParams],
+  );
+
+  // Build year options from current year going back 5 years
+  const thisYear = new Date().getFullYear();
+  const yearOptions = Array.from({ length: 6 }, (_, i) => thisYear - i);
+
+  return (
+    <div className="space-y-4">
+      {/* Toolbar */}
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div className="flex items-center gap-3">
+          <select
+            value={currentYear}
+            onChange={handleYearChange}
+            className="flex h-9 rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm"
+          >
+            <option value="">Alle Jahre</option>
+            {yearOptions.map((y) => (
+              <option key={y} value={String(y)}>
+                {y}
+              </option>
+            ))}
+          </select>
+
+          <select
+            value={currentStatus}
+            onChange={handleStatusChange}
+            className="flex h-9 rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm"
+          >
+            {STATUS_OPTIONS.map((opt) => (
+              <option key={opt.value} value={opt.value}>
+                {opt.label}
+              </option>
+            ))}
+          </select>
+        </div>
+      </div>
+
+      {/* Table */}
+      <Card>
+        <CardHeader>
+          <CardTitle>Fangbücher ({total})</CardTitle>
+        </CardHeader>
+        <CardContent>
+          {data.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Keine Fangbücher vorhanden</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Es wurden noch keine Fangbücher angelegt.
+              </p>
+            </div>
+          ) : (
+            <div className="rounded-md border">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b bg-muted/50">
+                    <th className="p-3 text-left font-medium">Mitglied</th>
+                    <th className="p-3 text-right font-medium">Jahr</th>
+                    <th className="p-3 text-right font-medium">Angeltage</th>
+                    <th className="p-3 text-right font-medium">Fänge</th>
+                    <th className="p-3 text-left font-medium">Status</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((cb) => {
+                    const members = cb.members as Record<string, unknown> | null;
+                    const memberName = members
+                      ? `${String(members.first_name ?? '')} ${String(members.last_name ?? '')}`.trim()
+                      : String(cb.member_name ?? '—');
+                    const status = String(cb.status ?? 'offen');
+
+                    return (
+                      <tr
+                        key={String(cb.id)}
+                        className="cursor-pointer border-b hover:bg-muted/30"
+                        onClick={() =>
+                          router.push(
+                            `/home/${account}/fischerei/catch-books/${String(cb.id)}`,
+                          )
+                        }
+                      >
+                        <td className="p-3 font-medium">{memberName}</td>
+                        <td className="p-3 text-right">{String(cb.year)}</td>
+                        <td className="p-3 text-right">
+                          {String(cb.fishing_days_count ?? 0)}
+                        </td>
+                        <td className="p-3 text-right">
+                          {String(cb.total_fish_caught ?? 0)}
+                        </td>
+                        <td className="p-3">
+                          <Badge
+                            variant={
+                              (CATCH_BOOK_STATUS_COLORS[status] as
+                                | 'secondary'
+                                | 'default'
+                                | 'outline'
+                                | 'destructive') ?? 'secondary'
+                            }
+                          >
+                            {CATCH_BOOK_STATUS_LABELS[status] ?? status}
+                          </Badge>
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {totalPages > 1 && (
+            <div className="mt-4 flex items-center justify-between">
+              <p className="text-sm text-muted-foreground">
+                Seite {page} von {totalPages} ({total} Einträge)
+              </p>
+              <div className="flex gap-2">
+                <Button variant="outline" size="sm" disabled={page <= 1} onClick={() => handlePageChange(page - 1)}>
+                  Zurück
+                </Button>
+                <Button variant="outline" size="sm" disabled={page >= totalPages} onClick={() => handlePageChange(page + 1)}>
+                  Weiter
+                </Button>
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/fischerei/src/components/competitions-data-table.tsx b/packages/features/fischerei/src/components/competitions-data-table.tsx
new file mode 100644
index 000000000..8436e97ed
--- /dev/null
+++ b/packages/features/fischerei/src/components/competitions-data-table.tsx
@@ -0,0 +1,146 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useRouter, useSearchParams } from 'next/navigation';
+import Link from 'next/link';
+
+import { Plus } from 'lucide-react';
+
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+interface CompetitionsDataTableProps {
+  data: Array<Record<string, unknown>>;
+  total: number;
+  page: number;
+  pageSize: number;
+  account: string;
+}
+
+export function CompetitionsDataTable({
+  data,
+  total,
+  page,
+  pageSize,
+  account,
+}: CompetitionsDataTableProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+
+  const updateParams = useCallback(
+    (updates: Record<string, string>) => {
+      const params = new URLSearchParams(searchParams.toString());
+      for (const [key, value] of Object.entries(updates)) {
+        if (value) {
+          params.set(key, value);
+        } else {
+          params.delete(key);
+        }
+      }
+      if (!('page' in updates)) params.delete('page');
+      router.push(`?${params.toString()}`);
+    },
+    [router, searchParams],
+  );
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      updateParams({ page: String(newPage) });
+    },
+    [updateParams],
+  );
+
+  return (
+    <div className="space-y-4">
+      {/* Toolbar */}
+      <div className="flex items-center justify-between">
+        <h2 className="text-lg font-semibold">Wettbewerbe ({total})</h2>
+        <Link href={`/home/${account}/fischerei/competitions/new`}>
+          <Button size="sm">
+            <Plus className="mr-2 h-4 w-4" />
+            Neuer Wettbewerb
+          </Button>
+        </Link>
+      </div>
+
+      {/* Table */}
+      <Card>
+        <CardContent className="pt-6">
+          {data.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Keine Wettbewerbe vorhanden</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Erstellen Sie Ihren ersten Wettbewerb.
+              </p>
+              <Link href={`/home/${account}/fischerei/competitions/new`} className="mt-4">
+                <Button>Neuer Wettbewerb</Button>
+              </Link>
+            </div>
+          ) : (
+            <div className="rounded-md border">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b bg-muted/50">
+                    <th className="p-3 text-left font-medium">Name</th>
+                    <th className="p-3 text-left font-medium">Datum</th>
+                    <th className="p-3 text-left font-medium">Gewässer</th>
+                    <th className="p-3 text-right font-medium">Max. Teilnehmer</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((comp) => {
+                    const waters = comp.waters as Record<string, unknown> | null;
+
+                    return (
+                      <tr
+                        key={String(comp.id)}
+                        className="cursor-pointer border-b hover:bg-muted/30"
+                        onClick={() =>
+                          router.push(
+                            `/home/${account}/fischerei/competitions/${String(comp.id)}`,
+                          )
+                        }
+                      >
+                        <td className="p-3 font-medium">{String(comp.name)}</td>
+                        <td className="p-3">
+                          {comp.competition_date
+                            ? new Date(String(comp.competition_date)).toLocaleDateString('de-DE')
+                            : '—'}
+                        </td>
+                        <td className="p-3">
+                          {waters ? String(waters.name) : '—'}
+                        </td>
+                        <td className="p-3 text-right">
+                          {comp.max_participants != null
+                            ? String(comp.max_participants)
+                            : '—'}
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {totalPages > 1 && (
+            <div className="mt-4 flex items-center justify-between">
+              <p className="text-sm text-muted-foreground">
+                Seite {page} von {totalPages} ({total} Einträge)
+              </p>
+              <div className="flex gap-2">
+                <Button variant="outline" size="sm" disabled={page <= 1} onClick={() => handlePageChange(page - 1)}>
+                  Zurück
+                </Button>
+                <Button variant="outline" size="sm" disabled={page >= totalPages} onClick={() => handlePageChange(page + 1)}>
+                  Weiter
+                </Button>
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/fischerei/src/components/create-species-form.tsx b/packages/features/fischerei/src/components/create-species-form.tsx
new file mode 100644
index 000000000..ce26faa45
--- /dev/null
+++ b/packages/features/fischerei/src/components/create-species-form.tsx
@@ -0,0 +1,245 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { useAction } from 'next-safe-action/hooks';
+import { useRouter } from 'next/navigation';
+
+import { Button } from '@kit/ui/button';
+import { Input } from '@kit/ui/input';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@kit/ui/form';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+
+import { CreateFishSpeciesSchema } from '../schema/fischerei.schema';
+import { createSpecies } from '../server/actions/fischerei-actions';
+
+interface CreateSpeciesFormProps {
+  accountId: string;
+  account: string;
+  species?: Record<string, unknown>;
+}
+
+export function CreateSpeciesForm({
+  accountId,
+  account,
+  species,
+}: CreateSpeciesFormProps) {
+  const router = useRouter();
+  const isEdit = !!species;
+
+  const form = useForm({
+    resolver: zodResolver(CreateFishSpeciesSchema),
+    defaultValues: {
+      accountId,
+      name: (species?.name as string) ?? '',
+      nameLatin: (species?.name_latin as string) ?? '',
+      nameLocal: (species?.name_local as string) ?? '',
+      isActive: species?.is_active != null ? Boolean(species.is_active) : true,
+      protectedMinSizeCm: species?.protected_min_size_cm != null ? Number(species.protected_min_size_cm) : undefined,
+      protectionPeriodStart: (species?.protection_period_start as string) ?? '',
+      protectionPeriodEnd: (species?.protection_period_end as string) ?? '',
+      maxCatchPerDay: species?.max_catch_per_day != null ? Number(species.max_catch_per_day) : undefined,
+      maxCatchPerYear: species?.max_catch_per_year != null ? Number(species.max_catch_per_year) : undefined,
+      individualRecording: species?.individual_recording != null ? Boolean(species.individual_recording) : false,
+    },
+  });
+
+  const { execute, isPending } = useAction(createSpecies, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success(isEdit ? 'Fischart aktualisiert' : 'Fischart erstellt');
+        router.push(`/home/${account}/fischerei/species`);
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Speichern');
+    },
+  });
+
+  return (
+    <Form {...form}>
+      <form
+        onSubmit={form.handleSubmit((data) => execute(data))}
+        className="space-y-6"
+      >
+        {/* Card 1: Grunddaten */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Grunddaten</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Name *</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="nameLatin"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Lateinischer Name</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="nameLocal"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Lokaler Name</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Card 2: Schutzbestimmungen */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Schutzbestimmungen</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-3">
+            <FormField
+              control={form.control}
+              name="protectedMinSizeCm"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Schonmaß (cm)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      step="0.1"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="protectionPeriodStart"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Schonzeit Beginn (MM.TT)</FormLabel>
+                  <FormControl>
+                    <Input placeholder="z.B. 03.01" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="protectionPeriodEnd"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Schonzeit Ende (MM.TT)</FormLabel>
+                  <FormControl>
+                    <Input placeholder="z.B. 06.30" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Card 3: Fangbegrenzungen */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Fangbegrenzungen</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="maxCatchPerDay"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Max. Fang/Tag</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="maxCatchPerYear"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Max. Fang/Jahr</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Submit */}
+        <div className="flex justify-end gap-2">
+          <Button type="button" variant="outline" onClick={() => router.back()}>
+            Abbrechen
+          </Button>
+          <Button type="submit" disabled={isPending}>
+            {isPending
+              ? 'Wird gespeichert...'
+              : isEdit
+                ? 'Fischart aktualisieren'
+                : 'Fischart erstellen'}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+}
diff --git a/packages/features/fischerei/src/components/create-stocking-form.tsx b/packages/features/fischerei/src/components/create-stocking-form.tsx
new file mode 100644
index 000000000..78f16d4c5
--- /dev/null
+++ b/packages/features/fischerei/src/components/create-stocking-form.tsx
@@ -0,0 +1,257 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { useAction } from 'next-safe-action/hooks';
+import { useRouter } from 'next/navigation';
+
+import { Button } from '@kit/ui/button';
+import { Input } from '@kit/ui/input';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@kit/ui/form';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+
+import { CreateStockingSchema } from '../schema/fischerei.schema';
+import { createStocking } from '../server/actions/fischerei-actions';
+
+interface CreateStockingFormProps {
+  accountId: string;
+  account: string;
+  waters: Array<{ id: string; name: string }>;
+  species: Array<{ id: string; name: string }>;
+}
+
+export function CreateStockingForm({
+  accountId,
+  account,
+  waters,
+  species,
+}: CreateStockingFormProps) {
+  const router = useRouter();
+
+  const form = useForm({
+    resolver: zodResolver(CreateStockingSchema),
+    defaultValues: {
+      accountId,
+      waterId: '',
+      speciesId: '',
+      stockingDate: new Date().toISOString().split('T')[0],
+      quantity: 0,
+      weightKg: undefined as number | undefined,
+      ageClass: 'sonstige' as const,
+      costEuros: undefined as number | undefined,
+      supplierId: undefined as string | undefined,
+      remarks: '',
+    },
+  });
+
+  const { execute, isPending } = useAction(createStocking, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success('Besatz eingetragen');
+        router.push(`/home/${account}/fischerei/stocking`);
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Speichern');
+    },
+  });
+
+  return (
+    <Form {...form}>
+      <form
+        onSubmit={form.handleSubmit((data) => execute(data))}
+        className="space-y-6"
+      >
+        <Card>
+          <CardHeader>
+            <CardTitle>Besatzdaten</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="waterId"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Gewässer *</FormLabel>
+                  <FormControl>
+                    <select
+                      {...field}
+                      className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                    >
+                      <option value="">— Gewässer wählen —</option>
+                      {waters.map((w) => (
+                        <option key={w.id} value={w.id}>
+                          {w.name}
+                        </option>
+                      ))}
+                    </select>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="speciesId"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Fischart *</FormLabel>
+                  <FormControl>
+                    <select
+                      {...field}
+                      className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                    >
+                      <option value="">— Fischart wählen —</option>
+                      {species.map((s) => (
+                        <option key={s.id} value={s.id}>
+                          {s.name}
+                        </option>
+                      ))}
+                    </select>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="stockingDate"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Besatzdatum *</FormLabel>
+                  <FormControl>
+                    <Input type="date" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="quantity"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Anzahl (Stück) *</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      min={0}
+                      {...field}
+                      onChange={(e) => field.onChange(Number(e.target.value))}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="weightKg"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Gewicht (kg)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      step="0.01"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="ageClass"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Altersklasse</FormLabel>
+                  <FormControl>
+                    <select
+                      {...field}
+                      className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                    >
+                      <option value="brut">Brut</option>
+                      <option value="soemmerlinge">Sömmerlinge</option>
+                      <option value="einsoemmerig">1-sömmrig</option>
+                      <option value="zweisoemmerig">2-sömmrig</option>
+                      <option value="dreisoemmerig">3-sömmrig</option>
+                      <option value="vorgestreckt">Vorgestreckt</option>
+                      <option value="setzlinge">Setzlinge</option>
+                      <option value="laichfische">Laichfische</option>
+                      <option value="sonstige">Sonstige</option>
+                    </select>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="costEuros"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Kosten (EUR)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      step="0.01"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <div className="sm:col-span-2">
+              <FormField
+                control={form.control}
+                name="remarks"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Bemerkungen</FormLabel>
+                    <FormControl>
+                      <textarea
+                        {...field}
+                        className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+          </CardContent>
+        </Card>
+
+        <div className="flex justify-end gap-2">
+          <Button type="button" variant="outline" onClick={() => router.back()}>
+            Abbrechen
+          </Button>
+          <Button type="submit" disabled={isPending}>
+            {isPending ? 'Wird gespeichert...' : 'Besatz eintragen'}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+}
diff --git a/packages/features/fischerei/src/components/create-water-form.tsx b/packages/features/fischerei/src/components/create-water-form.tsx
new file mode 100644
index 000000000..92ee25091
--- /dev/null
+++ b/packages/features/fischerei/src/components/create-water-form.tsx
@@ -0,0 +1,445 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { useAction } from 'next-safe-action/hooks';
+import { useRouter } from 'next/navigation';
+
+import { Button } from '@kit/ui/button';
+import { Input } from '@kit/ui/input';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@kit/ui/form';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+
+import { CreateWaterSchema } from '../schema/fischerei.schema';
+import { createWater } from '../server/actions/fischerei-actions';
+
+interface CreateWaterFormProps {
+  accountId: string;
+  account: string;
+  water?: Record<string, unknown>;
+}
+
+export function CreateWaterForm({
+  accountId,
+  account,
+  water,
+}: CreateWaterFormProps) {
+  const router = useRouter();
+  const isEdit = !!water;
+
+  const form = useForm({
+    resolver: zodResolver(CreateWaterSchema),
+    defaultValues: {
+      accountId,
+      name: (water?.name as string) ?? '',
+      shortName: (water?.short_name as string) ?? '',
+      waterType: (water?.water_type as string) ?? 'sonstige',
+      description: (water?.description as string) ?? '',
+      surfaceAreaHa: water?.surface_area_ha != null ? Number(water.surface_area_ha) : undefined,
+      lengthM: water?.length_m != null ? Number(water.length_m) : undefined,
+      widthM: water?.width_m != null ? Number(water.width_m) : undefined,
+      avgDepthM: water?.avg_depth_m != null ? Number(water.avg_depth_m) : undefined,
+      maxDepthM: water?.max_depth_m != null ? Number(water.max_depth_m) : undefined,
+      outflow: (water?.outflow as string) ?? '',
+      location: (water?.location as string) ?? '',
+      county: (water?.county as string) ?? '',
+      geoLat: water?.geo_lat != null ? Number(water.geo_lat) : undefined,
+      geoLng: water?.geo_lng != null ? Number(water.geo_lng) : undefined,
+      lfvNumber: (water?.lfv_number as string) ?? '',
+      costShareDs: water?.cost_share_ds != null ? Number(water.cost_share_ds) : undefined,
+    },
+  });
+
+  const { execute, isPending } = useAction(createWater, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success(isEdit ? 'Gewässer aktualisiert' : 'Gewässer erstellt');
+        router.push(`/home/${account}/fischerei/waters`);
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Speichern');
+    },
+  });
+
+  return (
+    <Form {...form}>
+      <form
+        onSubmit={form.handleSubmit((data) => execute(data))}
+        className="space-y-6"
+      >
+        {/* Card 1: Grunddaten */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Grunddaten</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Name *</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="shortName"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Kurzname</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="waterType"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Gewässertyp</FormLabel>
+                  <FormControl>
+                    <select
+                      {...field}
+                      className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                    >
+                      <option value="fluss">Fluss</option>
+                      <option value="bach">Bach</option>
+                      <option value="see">See</option>
+                      <option value="teich">Teich</option>
+                      <option value="weiher">Weiher</option>
+                      <option value="kanal">Kanal</option>
+                      <option value="stausee">Stausee</option>
+                      <option value="baggersee">Baggersee</option>
+                      <option value="sonstige">Sonstige</option>
+                    </select>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <div className="sm:col-span-2">
+              <FormField
+                control={form.control}
+                name="description"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Beschreibung</FormLabel>
+                    <FormControl>
+                      <textarea
+                        {...field}
+                        className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+          </CardContent>
+        </Card>
+
+        {/* Card 2: Abmessungen */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Abmessungen</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-3">
+            <FormField
+              control={form.control}
+              name="surfaceAreaHa"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Fläche (ha)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      step="0.01"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(
+                          e.target.value ? Number(e.target.value) : undefined,
+                        )
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="lengthM"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Länge (m)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(
+                          e.target.value ? Number(e.target.value) : undefined,
+                        )
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="widthM"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Breite (m)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      step="0.01"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(
+                          e.target.value ? Number(e.target.value) : undefined,
+                        )
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="avgDepthM"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Durchschnittstiefe (m)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      step="0.01"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(
+                          e.target.value ? Number(e.target.value) : undefined,
+                        )
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="maxDepthM"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Maximaltiefe (m)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      step="0.01"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(
+                          e.target.value ? Number(e.target.value) : undefined,
+                        )
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Card 3: Geografie */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Geografie</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="outflow"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Abfluss</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="location"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Lage/Standort</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="county"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Landkreis</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <div className="grid grid-cols-2 gap-4">
+              <FormField
+                control={form.control}
+                name="geoLat"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Breitengrad</FormLabel>
+                    <FormControl>
+                      <Input
+                        type="number"
+                        step="0.0000001"
+                        {...field}
+                        value={field.value ?? ''}
+                        onChange={(e) =>
+                          field.onChange(
+                            e.target.value ? Number(e.target.value) : undefined,
+                          )
+                        }
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name="geoLng"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Längengrad</FormLabel>
+                    <FormControl>
+                      <Input
+                        type="number"
+                        step="0.0000001"
+                        {...field}
+                        value={field.value ?? ''}
+                        onChange={(e) =>
+                          field.onChange(
+                            e.target.value ? Number(e.target.value) : undefined,
+                          )
+                        }
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+          </CardContent>
+        </Card>
+
+        {/* Card 4: Verwaltung */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Verwaltung</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="lfvNumber"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>LFV-Nummer</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="costShareDs"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Kostenanteil DS (%)</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      min={0}
+                      max={100}
+                      step="0.01"
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(
+                          e.target.value ? Number(e.target.value) : undefined,
+                        )
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Submit */}
+        <div className="flex justify-end gap-2">
+          <Button type="button" variant="outline" onClick={() => router.back()}>
+            Abbrechen
+          </Button>
+          <Button type="submit" disabled={isPending}>
+            {isPending
+              ? 'Wird gespeichert...'
+              : isEdit
+                ? 'Gewässer aktualisieren'
+                : 'Gewässer erstellen'}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+}
diff --git a/packages/features/fischerei/src/components/fischerei-dashboard.tsx b/packages/features/fischerei/src/components/fischerei-dashboard.tsx
new file mode 100644
index 000000000..afb0614f5
--- /dev/null
+++ b/packages/features/fischerei/src/components/fischerei-dashboard.tsx
@@ -0,0 +1,171 @@
+'use client';
+
+import Link from 'next/link';
+
+import {
+  Droplets,
+  Fish,
+  FileText,
+  BookOpen,
+  Trophy,
+  Euro,
+} from 'lucide-react';
+
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+interface DashboardStats {
+  watersCount: number;
+  speciesCount: number;
+  activeLeasesCount: number;
+  pendingCatchBooksCount: number;
+  upcomingCompetitionsCount: number;
+  stockingCostYtd: number;
+}
+
+interface FischereiDashboardProps {
+  stats: DashboardStats;
+  account: string;
+}
+
+export function FischereiDashboard({ stats, account }: FischereiDashboardProps) {
+  return (
+    <div className="flex w-full flex-col gap-6">
+      {/* Header */}
+      <div>
+        <h1 className="text-2xl font-bold">Fischerei – Übersicht</h1>
+        <p className="text-muted-foreground">
+          Gewässer, Fischarten, Besatz, Fangbücher und mehr verwalten
+        </p>
+      </div>
+
+      {/* Stats Grid */}
+      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
+        <Link href={`/home/${account}/fischerei/waters`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Gewässer</p>
+                  <p className="text-2xl font-bold">{stats.watersCount}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <Droplets className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Link href={`/home/${account}/fischerei/species`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Fischarten</p>
+                  <p className="text-2xl font-bold">{stats.speciesCount}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <Fish className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Link href={`/home/${account}/fischerei/leases`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Aktive Pachten</p>
+                  <p className="text-2xl font-bold">{stats.activeLeasesCount}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <FileText className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Link href={`/home/${account}/fischerei/catch-books`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Offene Fangbücher</p>
+                  <p className="text-2xl font-bold">{stats.pendingCatchBooksCount}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <BookOpen className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Link href={`/home/${account}/fischerei/competitions`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Kommende Wettbewerbe</p>
+                  <p className="text-2xl font-bold">{stats.upcomingCompetitionsCount}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <Trophy className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Link href={`/home/${account}/fischerei/stocking`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Besatzkosten (lfd. Jahr)</p>
+                  <p className="text-2xl font-bold">
+                    {stats.stockingCostYtd.toLocaleString('de-DE', {
+                      style: 'currency',
+                      currency: 'EUR',
+                    })}
+                  </p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <Euro className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+      </div>
+
+      {/* Quick Access Sections */}
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-base">Letzte Besatzaktionen</CardTitle>
+          </CardHeader>
+          <CardContent>
+            <p className="text-sm text-muted-foreground">
+              Noch keine Besatzaktionen vorhanden.
+            </p>
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-base">Offene Fangbücher</CardTitle>
+          </CardHeader>
+          <CardContent>
+            <p className="text-sm text-muted-foreground">
+              Keine Fangbücher zur Prüfung ausstehend.
+            </p>
+          </CardContent>
+        </Card>
+      </div>
+    </div>
+  );
+}
diff --git a/packages/features/fischerei/src/components/fischerei-tab-navigation.tsx b/packages/features/fischerei/src/components/fischerei-tab-navigation.tsx
new file mode 100644
index 000000000..9f3479e81
--- /dev/null
+++ b/packages/features/fischerei/src/components/fischerei-tab-navigation.tsx
@@ -0,0 +1,54 @@
+'use client';
+
+import Link from 'next/link';
+import { usePathname } from 'next/navigation';
+import { cn } from '@kit/ui/utils';
+
+interface FischereiTabNavigationProps {
+  account: string;
+  activeTab: string;
+}
+
+const TABS = [
+  { id: 'overview', label: 'Übersicht', path: '' },
+  { id: 'waters', label: 'Gewässer', path: '/waters' },
+  { id: 'species', label: 'Fischarten', path: '/species' },
+  { id: 'stocking', label: 'Besatz', path: '/stocking' },
+  { id: 'leases', label: 'Pachten', path: '/leases' },
+  { id: 'catch-books', label: 'Fangbücher', path: '/catch-books' },
+  { id: 'permits', label: 'Erlaubnisscheine', path: '/permits' },
+  { id: 'competitions', label: 'Wettbewerbe', path: '/competitions' },
+  { id: 'statistics', label: 'Statistiken', path: '/statistics' },
+] as const;
+
+export function FischereiTabNavigation({
+  account,
+  activeTab,
+}: FischereiTabNavigationProps) {
+  const basePath = `/home/${account}/fischerei`;
+
+  return (
+    <div className="mb-6 border-b">
+      <nav className="-mb-px flex space-x-1 overflow-x-auto" aria-label="Fischerei Navigation">
+        {TABS.map((tab) => {
+          const isActive = tab.id === activeTab;
+
+          return (
+            <Link
+              key={tab.id}
+              href={`${basePath}${tab.path}`}
+              className={cn(
+                'whitespace-nowrap border-b-2 px-4 py-2.5 text-sm font-medium transition-colors',
+                isActive
+                  ? 'border-primary text-primary'
+                  : 'border-transparent text-muted-foreground hover:border-muted-foreground/30 hover:text-foreground',
+              )}
+            >
+              {tab.label}
+            </Link>
+          );
+        })}
+      </nav>
+    </div>
+  );
+}
diff --git a/packages/features/fischerei/src/components/index.ts b/packages/features/fischerei/src/components/index.ts
new file mode 100644
index 000000000..63370d4dd
--- /dev/null
+++ b/packages/features/fischerei/src/components/index.ts
@@ -0,0 +1,10 @@
+export { FischereiTabNavigation } from './fischerei-tab-navigation';
+export { FischereiDashboard } from './fischerei-dashboard';
+export { WatersDataTable } from './waters-data-table';
+export { CreateWaterForm } from './create-water-form';
+export { SpeciesDataTable } from './species-data-table';
+export { CreateSpeciesForm } from './create-species-form';
+export { StockingDataTable } from './stocking-data-table';
+export { CreateStockingForm } from './create-stocking-form';
+export { CatchBooksDataTable } from './catch-books-data-table';
+export { CompetitionsDataTable } from './competitions-data-table';
diff --git a/packages/features/fischerei/src/components/species-data-table.tsx b/packages/features/fischerei/src/components/species-data-table.tsx
new file mode 100644
index 000000000..87d21d217
--- /dev/null
+++ b/packages/features/fischerei/src/components/species-data-table.tsx
@@ -0,0 +1,179 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useForm } from 'react-hook-form';
+import { useRouter, useSearchParams } from 'next/navigation';
+import Link from 'next/link';
+
+import { Plus } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { Input } from '@kit/ui/input';
+
+interface SpeciesDataTableProps {
+  data: Array<Record<string, unknown>>;
+  total: number;
+  page: number;
+  pageSize: number;
+  account: string;
+}
+
+export function SpeciesDataTable({
+  data,
+  total,
+  page,
+  pageSize,
+  account,
+}: SpeciesDataTableProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const currentSearch = searchParams.get('q') ?? '';
+  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+
+  const form = useForm({
+    defaultValues: { search: currentSearch },
+  });
+
+  const updateParams = useCallback(
+    (updates: Record<string, string>) => {
+      const params = new URLSearchParams(searchParams.toString());
+      for (const [key, value] of Object.entries(updates)) {
+        if (value) {
+          params.set(key, value);
+        } else {
+          params.delete(key);
+        }
+      }
+      if (!('page' in updates)) params.delete('page');
+      router.push(`?${params.toString()}`);
+    },
+    [router, searchParams],
+  );
+
+  const handleSearch = useCallback(
+    (e: React.FormEvent) => {
+      e.preventDefault();
+      updateParams({ q: form.getValues('search') });
+    },
+    [form, updateParams],
+  );
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      updateParams({ page: String(newPage) });
+    },
+    [updateParams],
+  );
+
+  return (
+    <div className="space-y-4">
+      {/* Toolbar */}
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <form onSubmit={handleSearch} className="flex gap-2">
+          <Input
+            placeholder="Fischart suchen..."
+            className="w-64"
+            {...form.register('search')}
+          />
+          <Button type="submit" variant="outline" size="sm">
+            Suchen
+          </Button>
+        </form>
+
+        <Link href={`/home/${account}/fischerei/species/new`}>
+          <Button size="sm">
+            <Plus className="mr-2 h-4 w-4" />
+            Neue Fischart
+          </Button>
+        </Link>
+      </div>
+
+      {/* Table */}
+      <Card>
+        <CardHeader>
+          <CardTitle>Fischarten ({total})</CardTitle>
+        </CardHeader>
+        <CardContent>
+          {data.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Keine Fischarten vorhanden</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Erstellen Sie Ihre erste Fischart.
+              </p>
+              <Link href={`/home/${account}/fischerei/species/new`} className="mt-4">
+                <Button>Neue Fischart</Button>
+              </Link>
+            </div>
+          ) : (
+            <div className="rounded-md border">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b bg-muted/50">
+                    <th className="p-3 text-left font-medium">Name</th>
+                    <th className="p-3 text-left font-medium">Lat. Name</th>
+                    <th className="p-3 text-right font-medium">Schonmaß (cm)</th>
+                    <th className="p-3 text-left font-medium">Schonzeit</th>
+                    <th className="p-3 text-right font-medium">Max. Fang/Tag</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((species) => (
+                    <tr key={String(species.id)} className="border-b hover:bg-muted/30">
+                      <td className="p-3 font-medium">{String(species.name)}</td>
+                      <td className="p-3 italic text-muted-foreground">
+                        {String(species.name_latin ?? '—')}
+                      </td>
+                      <td className="p-3 text-right">
+                        {species.protected_min_size_cm != null
+                          ? `${Number(species.protected_min_size_cm)} cm`
+                          : '—'}
+                      </td>
+                      <td className="p-3">
+                        {species.protection_period_start && species.protection_period_end
+                          ? `${String(species.protection_period_start)} – ${String(species.protection_period_end)}`
+                          : '—'}
+                      </td>
+                      <td className="p-3 text-right">
+                        {species.max_catch_per_day != null
+                          ? String(species.max_catch_per_day)
+                          : '—'}
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {totalPages > 1 && (
+            <div className="mt-4 flex items-center justify-between">
+              <p className="text-sm text-muted-foreground">
+                Seite {page} von {totalPages} ({total} Einträge)
+              </p>
+              <div className="flex gap-2">
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page <= 1}
+                  onClick={() => handlePageChange(page - 1)}
+                >
+                  Zurück
+                </Button>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page >= totalPages}
+                  onClick={() => handlePageChange(page + 1)}
+                >
+                  Weiter
+                </Button>
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/fischerei/src/components/stocking-data-table.tsx b/packages/features/fischerei/src/components/stocking-data-table.tsx
new file mode 100644
index 000000000..252850018
--- /dev/null
+++ b/packages/features/fischerei/src/components/stocking-data-table.tsx
@@ -0,0 +1,158 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useForm } from 'react-hook-form';
+import { useRouter, useSearchParams } from 'next/navigation';
+import Link from 'next/link';
+
+import { Plus } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { Input } from '@kit/ui/input';
+
+import { AGE_CLASS_LABELS } from '../lib/fischerei-constants';
+
+interface StockingDataTableProps {
+  data: Array<Record<string, unknown>>;
+  total: number;
+  page: number;
+  pageSize: number;
+  account: string;
+}
+
+export function StockingDataTable({
+  data,
+  total,
+  page,
+  pageSize,
+  account,
+}: StockingDataTableProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+
+  const updateParams = useCallback(
+    (updates: Record<string, string>) => {
+      const params = new URLSearchParams(searchParams.toString());
+      for (const [key, value] of Object.entries(updates)) {
+        if (value) {
+          params.set(key, value);
+        } else {
+          params.delete(key);
+        }
+      }
+      if (!('page' in updates)) params.delete('page');
+      router.push(`?${params.toString()}`);
+    },
+    [router, searchParams],
+  );
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      updateParams({ page: String(newPage) });
+    },
+    [updateParams],
+  );
+
+  return (
+    <div className="space-y-4">
+      {/* Toolbar */}
+      <div className="flex items-center justify-between">
+        <h2 className="text-lg font-semibold">Besatz ({total})</h2>
+        <Link href={`/home/${account}/fischerei/stocking/new`}>
+          <Button size="sm">
+            <Plus className="mr-2 h-4 w-4" />
+            Besatz eintragen
+          </Button>
+        </Link>
+      </div>
+
+      {/* Table */}
+      <Card>
+        <CardContent className="pt-6">
+          {data.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Keine Besatzeinträge vorhanden</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Tragen Sie den ersten Besatz ein.
+              </p>
+              <Link href={`/home/${account}/fischerei/stocking/new`} className="mt-4">
+                <Button>Besatz eintragen</Button>
+              </Link>
+            </div>
+          ) : (
+            <div className="rounded-md border">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b bg-muted/50">
+                    <th className="p-3 text-left font-medium">Datum</th>
+                    <th className="p-3 text-left font-medium">Gewässer</th>
+                    <th className="p-3 text-left font-medium">Fischart</th>
+                    <th className="p-3 text-right font-medium">Anzahl</th>
+                    <th className="p-3 text-right font-medium">Gewicht (kg)</th>
+                    <th className="p-3 text-left font-medium">Altersklasse</th>
+                    <th className="p-3 text-right font-medium">Kosten (€)</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((row) => {
+                    const waters = row.waters as Record<string, unknown> | null;
+                    const species = row.fish_species as Record<string, unknown> | null;
+
+                    return (
+                      <tr key={String(row.id)} className="border-b hover:bg-muted/30">
+                        <td className="p-3">
+                          {row.stocking_date
+                            ? new Date(String(row.stocking_date)).toLocaleDateString('de-DE')
+                            : '—'}
+                        </td>
+                        <td className="p-3">{waters ? String(waters.name) : '—'}</td>
+                        <td className="p-3">{species ? String(species.name) : '—'}</td>
+                        <td className="p-3 text-right">
+                          {Number(row.quantity).toLocaleString('de-DE')}
+                        </td>
+                        <td className="p-3 text-right">
+                          {row.weight_kg != null
+                            ? `${Number(row.weight_kg).toLocaleString('de-DE')} kg`
+                            : '—'}
+                        </td>
+                        <td className="p-3">
+                          <Badge variant="secondary">
+                            {AGE_CLASS_LABELS[String(row.age_class)] ?? String(row.age_class)}
+                          </Badge>
+                        </td>
+                        <td className="p-3 text-right">
+                          {row.cost_euros != null
+                            ? `${Number(row.cost_euros).toLocaleString('de-DE', { minimumFractionDigits: 2 })} €`
+                            : '—'}
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {totalPages > 1 && (
+            <div className="mt-4 flex items-center justify-between">
+              <p className="text-sm text-muted-foreground">
+                Seite {page} von {totalPages} ({total} Einträge)
+              </p>
+              <div className="flex gap-2">
+                <Button variant="outline" size="sm" disabled={page <= 1} onClick={() => handlePageChange(page - 1)}>
+                  Zurück
+                </Button>
+                <Button variant="outline" size="sm" disabled={page >= totalPages} onClick={() => handlePageChange(page + 1)}>
+                  Weiter
+                </Button>
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/fischerei/src/components/waters-data-table.tsx b/packages/features/fischerei/src/components/waters-data-table.tsx
new file mode 100644
index 000000000..1ada82af0
--- /dev/null
+++ b/packages/features/fischerei/src/components/waters-data-table.tsx
@@ -0,0 +1,234 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useForm } from 'react-hook-form';
+import { useRouter, useSearchParams } from 'next/navigation';
+import Link from 'next/link';
+
+import { Plus } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { Input } from '@kit/ui/input';
+
+import { WATER_TYPE_LABELS } from '../lib/fischerei-constants';
+
+interface WatersDataTableProps {
+  data: Array<Record<string, unknown>>;
+  total: number;
+  page: number;
+  pageSize: number;
+  account: string;
+}
+
+const WATER_TYPE_OPTIONS = [
+  { value: '', label: 'Alle Typen' },
+  { value: 'fluss', label: 'Fluss' },
+  { value: 'bach', label: 'Bach' },
+  { value: 'see', label: 'See' },
+  { value: 'teich', label: 'Teich' },
+  { value: 'weiher', label: 'Weiher' },
+  { value: 'kanal', label: 'Kanal' },
+  { value: 'stausee', label: 'Stausee' },
+  { value: 'baggersee', label: 'Baggersee' },
+  { value: 'sonstige', label: 'Sonstige' },
+] as const;
+
+export function WatersDataTable({
+  data,
+  total,
+  page,
+  pageSize,
+  account,
+}: WatersDataTableProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const currentSearch = searchParams.get('q') ?? '';
+  const currentType = searchParams.get('type') ?? '';
+  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+
+  const form = useForm({
+    defaultValues: { search: currentSearch },
+  });
+
+  const updateParams = useCallback(
+    (updates: Record<string, string>) => {
+      const params = new URLSearchParams(searchParams.toString());
+      for (const [key, value] of Object.entries(updates)) {
+        if (value) {
+          params.set(key, value);
+        } else {
+          params.delete(key);
+        }
+      }
+      if (!('page' in updates)) {
+        params.delete('page');
+      }
+      router.push(`?${params.toString()}`);
+    },
+    [router, searchParams],
+  );
+
+  const handleSearch = useCallback(
+    (e: React.FormEvent) => {
+      e.preventDefault();
+      updateParams({ q: form.getValues('search') });
+    },
+    [form, updateParams],
+  );
+
+  const handleTypeChange = useCallback(
+    (e: React.ChangeEvent<HTMLSelectElement>) => {
+      updateParams({ type: e.target.value });
+    },
+    [updateParams],
+  );
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      updateParams({ page: String(newPage) });
+    },
+    [updateParams],
+  );
+
+  return (
+    <div className="space-y-4">
+      {/* Toolbar */}
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <form onSubmit={handleSearch} className="flex gap-2">
+          <Input
+            placeholder="Gewässer suchen..."
+            className="w-64"
+            {...form.register('search')}
+          />
+          <Button type="submit" variant="outline" size="sm">
+            Suchen
+          </Button>
+        </form>
+
+        <div className="flex items-center gap-3">
+          <select
+            value={currentType}
+            onChange={handleTypeChange}
+            className="flex h-9 rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm"
+          >
+            {WATER_TYPE_OPTIONS.map((opt) => (
+              <option key={opt.value} value={opt.value}>
+                {opt.label}
+              </option>
+            ))}
+          </select>
+
+          <Link href={`/home/${account}/fischerei/waters/new`}>
+            <Button size="sm">
+              <Plus className="mr-2 h-4 w-4" />
+              Neues Gewässer
+            </Button>
+          </Link>
+        </div>
+      </div>
+
+      {/* Table */}
+      <Card>
+        <CardHeader>
+          <CardTitle>Gewässer ({total})</CardTitle>
+        </CardHeader>
+        <CardContent>
+          {data.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Keine Gewässer vorhanden</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Erstellen Sie Ihr erstes Gewässer, um loszulegen.
+              </p>
+              <Link href={`/home/${account}/fischerei/waters/new`} className="mt-4">
+                <Button>Neues Gewässer</Button>
+              </Link>
+            </div>
+          ) : (
+            <div className="rounded-md border">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b bg-muted/50">
+                    <th className="p-3 text-left font-medium">Name</th>
+                    <th className="p-3 text-left font-medium">Kurzname</th>
+                    <th className="p-3 text-left font-medium">Typ</th>
+                    <th className="p-3 text-right font-medium">Fläche (ha)</th>
+                    <th className="p-3 text-left font-medium">Ort</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((water) => (
+                    <tr
+                      key={String(water.id)}
+                      className="cursor-pointer border-b hover:bg-muted/30"
+                      onClick={() =>
+                        router.push(
+                          `/home/${account}/fischerei/waters/${String(water.id)}`,
+                        )
+                      }
+                    >
+                      <td className="p-3 font-medium">
+                        <Link
+                          href={`/home/${account}/fischerei/waters/${String(water.id)}`}
+                          className="hover:underline"
+                        >
+                          {String(water.name)}
+                        </Link>
+                      </td>
+                      <td className="p-3 text-muted-foreground">
+                        {String(water.short_name ?? '—')}
+                      </td>
+                      <td className="p-3">
+                        <Badge variant="secondary">
+                          {WATER_TYPE_LABELS[String(water.water_type)] ??
+                            String(water.water_type)}
+                        </Badge>
+                      </td>
+                      <td className="p-3 text-right">
+                        {water.surface_area_ha != null
+                          ? `${Number(water.surface_area_ha).toLocaleString('de-DE')} ha`
+                          : '—'}
+                      </td>
+                      <td className="p-3 text-muted-foreground">
+                        {String(water.location ?? '—')}
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {/* Pagination */}
+          {totalPages > 1 && (
+            <div className="mt-4 flex items-center justify-between">
+              <p className="text-sm text-muted-foreground">
+                Seite {page} von {totalPages} ({total} Einträge)
+              </p>
+              <div className="flex gap-2">
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page <= 1}
+                  onClick={() => handlePageChange(page - 1)}
+                >
+                  Zurück
+                </Button>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page >= totalPages}
+                  onClick={() => handlePageChange(page + 1)}
+                >
+                  Weiter
+                </Button>
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/fischerei/src/lib/fischerei-constants.ts b/packages/features/fischerei/src/lib/fischerei-constants.ts
new file mode 100644
index 000000000..b81f77fac
--- /dev/null
+++ b/packages/features/fischerei/src/lib/fischerei-constants.ts
@@ -0,0 +1,102 @@
+/**
+ * German label mappings for all Fischerei enums and status colors.
+ */
+
+// =====================================================
+// Water Type Labels
+// =====================================================
+
+export const WATER_TYPE_LABELS: Record<string, string> = {
+  fluss: 'Fluss',
+  bach: 'Bach',
+  see: 'See',
+  teich: 'Teich',
+  weiher: 'Weiher',
+  kanal: 'Kanal',
+  stausee: 'Stausee',
+  baggersee: 'Baggersee',
+  sonstige: 'Sonstige',
+};
+
+// =====================================================
+// Fish Age Class Labels
+// =====================================================
+
+export const AGE_CLASS_LABELS: Record<string, string> = {
+  brut: 'Brut',
+  soemmerlinge: 'Sömmerlinge',
+  einsoemmerig: '1-sömmrig',
+  zweisoemmerig: '2-sömmrig',
+  dreisoemmerig: '3-sömmrig',
+  vorgestreckt: 'Vorgestreckt',
+  setzlinge: 'Setzlinge',
+  laichfische: 'Laichfische',
+  sonstige: 'Sonstige',
+};
+
+// =====================================================
+// Catch Book Status Labels
+// =====================================================
+
+export const CATCH_BOOK_STATUS_LABELS: Record<string, string> = {
+  offen: 'Offen',
+  eingereicht: 'Eingereicht',
+  geprueft: 'Geprüft',
+  akzeptiert: 'Akzeptiert',
+  abgelehnt: 'Abgelehnt',
+};
+
+// =====================================================
+// Catch Book Status Colors (Badge variants)
+// =====================================================
+
+export const CATCH_BOOK_STATUS_COLORS: Record<string, string> = {
+  offen: 'outline',
+  eingereicht: 'secondary',
+  geprueft: 'info',
+  akzeptiert: 'default',
+  abgelehnt: 'destructive',
+};
+
+// =====================================================
+// Verification Labels
+// =====================================================
+
+export const VERIFICATION_LABELS: Record<string, string> = {
+  sehrgut: 'Sehr gut',
+  gut: 'Gut',
+  ok: 'OK',
+  schlecht: 'Schlecht',
+  falsch: 'Falsch',
+  leer: 'Leer',
+};
+
+// =====================================================
+// Lease Payment Method Labels
+// =====================================================
+
+export const LEASE_PAYMENT_LABELS: Record<string, string> = {
+  bar: 'Bar',
+  lastschrift: 'Lastschrift',
+  ueberweisung: 'Überweisung',
+};
+
+// =====================================================
+// Fish Gender Labels
+// =====================================================
+
+export const FISH_GENDER_LABELS: Record<string, string> = {
+  maennlich: 'Männlich',
+  weiblich: 'Weiblich',
+  unbekannt: 'Unbekannt',
+};
+
+// =====================================================
+// Fish Size Category Labels
+// =====================================================
+
+export const SIZE_CATEGORY_LABELS: Record<string, string> = {
+  gross: 'Groß',
+  mittel: 'Mittel',
+  klein: 'Klein',
+};
diff --git a/packages/features/fischerei/src/lib/fischerei-utils.ts b/packages/features/fischerei/src/lib/fischerei-utils.ts
new file mode 100644
index 000000000..1e5e2f114
--- /dev/null
+++ b/packages/features/fischerei/src/lib/fischerei-utils.ts
@@ -0,0 +1,131 @@
+/**
+ * Utility functions for the Fischerei module.
+ */
+
+/**
+ * Compute the Fulton condition factor (K-factor) for a fish.
+ *
+ * Formula: K = (weight_g / length_cm^3) * 100000
+ *
+ * Returns null if either value is missing or zero.
+ */
+export function computeKFactor(
+  weightG: number | null | undefined,
+  lengthCm: number | null | undefined,
+): number | null {
+  if (!weightG || !lengthCm || lengthCm === 0) {
+    return null;
+  }
+
+  return Math.round((weightG / Math.pow(lengthCm, 3)) * 100000 * 1000) / 1000;
+}
+
+/**
+ * Check whether a given date falls within a protection period.
+ *
+ * @param startMMDD - Start date in MM.DD format (e.g. "03.01" for March 1st)
+ * @param endMMDD - End date in MM.DD format (e.g. "06.30" for June 30th)
+ * @param date - The date to check (defaults to today)
+ * @returns true if the date is within the protection period
+ */
+export function isInProtectionPeriod(
+  startMMDD: string | null | undefined,
+  endMMDD: string | null | undefined,
+  date?: Date,
+): boolean {
+  if (!startMMDD || !endMMDD) {
+    return false;
+  }
+
+  const now = date ?? new Date();
+  const currentMonth = now.getMonth() + 1;
+  const currentDay = now.getDate();
+
+  const [startMonth, startDay] = startMMDD.split('.').map(Number) as [
+    number,
+    number,
+  ];
+  const [endMonth, endDay] = endMMDD.split('.').map(Number) as [
+    number,
+    number,
+  ];
+
+  const currentValue = currentMonth * 100 + currentDay;
+  const startValue = startMonth * 100 + startDay;
+  const endValue = endMonth * 100 + endDay;
+
+  // Handle wrapping around year boundary (e.g. 10.01 - 02.28)
+  if (startValue <= endValue) {
+    return currentValue >= startValue && currentValue <= endValue;
+  } else {
+    return currentValue >= startValue || currentValue <= endValue;
+  }
+}
+
+/**
+ * Format GPS coordinates for display.
+ *
+ * @returns Formatted string like "48.1234, 11.5678" or "--" if no coords
+ */
+export function formatGpsCoords(
+  lat: number | null | undefined,
+  lng: number | null | undefined,
+): string {
+  if (lat == null || lng == null) {
+    return '--';
+  }
+
+  return `${lat.toFixed(4)}, ${lng.toFixed(4)}`;
+}
+
+/**
+ * Compute the lease amount for a given target year, accounting for
+ * either fixed annual increases or percentage-based increases.
+ *
+ * Mirrors the SQL function `public.compute_lease_amount`.
+ */
+export function computeLeaseAmountForYear(
+  initialAmount: number,
+  fixedIncrease: number,
+  percentageIncrease: number,
+  startYear: number,
+  targetYear: number,
+): number {
+  const yearOffset = targetYear - startYear;
+
+  if (yearOffset <= 0) {
+    return initialAmount;
+  }
+
+  let amount: number;
+
+  if (percentageIncrease > 0) {
+    amount =
+      initialAmount * Math.pow(1 + percentageIncrease / 100, yearOffset);
+  } else {
+    amount = initialAmount + fixedIncrease * yearOffset;
+  }
+
+  return Math.round(amount * 100) / 100;
+}
+
+/**
+ * Get the lucide icon name for a given water type.
+ */
+export function getWaterTypeIcon(type: string): string {
+  switch (type) {
+    case 'fluss':
+    case 'bach':
+    case 'kanal':
+      return 'Waves';
+    case 'see':
+    case 'stausee':
+    case 'baggersee':
+      return 'Droplets';
+    case 'teich':
+    case 'weiher':
+      return 'Droplet';
+    default:
+      return 'MapPin';
+  }
+}
diff --git a/packages/features/fischerei/src/schema/fischerei.schema.ts b/packages/features/fischerei/src/schema/fischerei.schema.ts
new file mode 100644
index 000000000..74581d434
--- /dev/null
+++ b/packages/features/fischerei/src/schema/fischerei.schema.ts
@@ -0,0 +1,430 @@
+import { z } from 'zod';
+
+// =====================================================
+// Enum Schemas
+// =====================================================
+
+export const waterTypeSchema = z.enum([
+  'fluss',
+  'bach',
+  'see',
+  'teich',
+  'weiher',
+  'kanal',
+  'stausee',
+  'baggersee',
+  'sonstige',
+]);
+
+export const fishAgeClassSchema = z.enum([
+  'brut',
+  'soemmerlinge',
+  'einsoemmerig',
+  'zweisoemmerig',
+  'dreisoemmerig',
+  'vorgestreckt',
+  'setzlinge',
+  'laichfische',
+  'sonstige',
+]);
+
+export const catchBookStatusSchema = z.enum([
+  'offen',
+  'eingereicht',
+  'geprueft',
+  'akzeptiert',
+  'abgelehnt',
+]);
+
+export const catchBookVerificationSchema = z.enum([
+  'sehrgut',
+  'gut',
+  'ok',
+  'schlecht',
+  'falsch',
+  'leer',
+]);
+
+export const leasePaymentMethodSchema = z.enum([
+  'bar',
+  'lastschrift',
+  'ueberweisung',
+]);
+
+export const fishGenderSchema = z.enum([
+  'maennlich',
+  'weiblich',
+  'unbekannt',
+]);
+
+export const fishSizeCategorySchema = z.enum([
+  'gross',
+  'mittel',
+  'klein',
+]);
+
+// =====================================================
+// Type exports from enums
+// =====================================================
+
+export type WaterType = z.infer<typeof waterTypeSchema>;
+export type FishAgeClass = z.infer<typeof fishAgeClassSchema>;
+export type CatchBookStatus = z.infer<typeof catchBookStatusSchema>;
+export type CatchBookVerification = z.infer<typeof catchBookVerificationSchema>;
+export type LeasePaymentMethod = z.infer<typeof leasePaymentMethodSchema>;
+export type FishGender = z.infer<typeof fishGenderSchema>;
+export type FishSizeCategory = z.infer<typeof fishSizeCategorySchema>;
+
+// =====================================================
+// Waters
+// =====================================================
+
+export const CreateWaterSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1).max(256),
+  shortName: z.string().max(32).optional(),
+  waterType: waterTypeSchema.default('sonstige'),
+  description: z.string().optional(),
+  surfaceAreaHa: z.number().optional(),
+  lengthM: z.number().optional(),
+  widthM: z.number().optional(),
+  avgDepthM: z.number().optional(),
+  maxDepthM: z.number().optional(),
+  outflow: z.string().optional(),
+  location: z.string().optional(),
+  classificationOrder: z.number().int().optional(),
+  county: z.string().optional(),
+  geoLat: z.number().min(-90).max(90).optional(),
+  geoLng: z.number().min(-180).max(180).optional(),
+  lfvNumber: z.string().optional(),
+  lfvName: z.string().optional(),
+  costShareDs: z.number().min(0).max(100).optional(),
+  costShareKalk: z.number().min(0).max(100).optional(),
+  electrofishingPermitRequested: z.boolean().default(false),
+  hejfishId: z.string().optional(),
+  costCenterId: z.string().uuid().optional(),
+  isArchived: z.boolean().default(false),
+});
+
+export const UpdateWaterSchema = CreateWaterSchema.partial().extend({
+  waterId: z.string().uuid(),
+});
+
+export type CreateWaterInput = z.infer<typeof CreateWaterSchema>;
+export type UpdateWaterInput = z.infer<typeof UpdateWaterSchema>;
+
+// =====================================================
+// Fish Species
+// =====================================================
+
+export const CreateFishSpeciesSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1).max(256),
+  nameLatin: z.string().optional(),
+  nameLocal: z.string().optional(),
+  isActive: z.boolean().default(true),
+  maxAgeYears: z.number().int().optional(),
+  maxWeightKg: z.number().optional(),
+  maxLengthCm: z.number().optional(),
+  protectedMinSizeCm: z.number().optional(),
+  protectionPeriodStart: z
+    .string()
+    .regex(/^\d{2}\.\d{2}$/)
+    .optional(),
+  protectionPeriodEnd: z
+    .string()
+    .regex(/^\d{2}\.\d{2}$/)
+    .optional(),
+  spawningSeasonStart: z
+    .string()
+    .regex(/^\d{2}\.\d{2}$/)
+    .optional(),
+  spawningSeasonEnd: z
+    .string()
+    .regex(/^\d{2}\.\d{2}$/)
+    .optional(),
+  hasSpecialSpawningSeason: z.boolean().default(false),
+  kFactorAvg: z.number().optional(),
+  kFactorMin: z.number().optional(),
+  kFactorMax: z.number().optional(),
+  pricePerUnit: z.number().optional(),
+  maxCatchPerDay: z.number().int().optional(),
+  maxCatchPerYear: z.number().int().optional(),
+  individualRecording: z.boolean().default(false),
+});
+
+export const UpdateFishSpeciesSchema = CreateFishSpeciesSchema.partial().extend({
+  speciesId: z.string().uuid(),
+});
+
+export type CreateFishSpeciesInput = z.infer<typeof CreateFishSpeciesSchema>;
+export type UpdateFishSpeciesInput = z.infer<typeof UpdateFishSpeciesSchema>;
+
+// =====================================================
+// Water-Species Rules
+// =====================================================
+
+export const CreateWaterSpeciesRuleSchema = z.object({
+  waterId: z.string().uuid(),
+  speciesId: z.string().uuid(),
+  minSizeCm: z.number().optional(),
+  protectionPeriodStart: z.string().optional(),
+  protectionPeriodEnd: z.string().optional(),
+  maxCatchPerDay: z.number().int().optional(),
+  maxCatchPerYear: z.number().int().optional(),
+});
+
+export type CreateWaterSpeciesRuleInput = z.infer<
+  typeof CreateWaterSpeciesRuleSchema
+>;
+
+// =====================================================
+// Stocking
+// =====================================================
+
+export const CreateStockingSchema = z.object({
+  accountId: z.string().uuid(),
+  waterId: z.string().uuid(),
+  speciesId: z.string().uuid(),
+  stockingDate: z.string(),
+  quantity: z.number().int().min(0),
+  weightKg: z.number().optional(),
+  ageClass: fishAgeClassSchema.default('sonstige'),
+  costEuros: z.number().optional(),
+  supplierId: z.string().uuid().optional(),
+  remarks: z.string().optional(),
+});
+
+export const UpdateStockingSchema = CreateStockingSchema.partial().extend({
+  stockingId: z.string().uuid(),
+});
+
+export type CreateStockingInput = z.infer<typeof CreateStockingSchema>;
+export type UpdateStockingInput = z.infer<typeof UpdateStockingSchema>;
+
+// =====================================================
+// Leases
+// =====================================================
+
+export const CreateLeaseSchema = z.object({
+  accountId: z.string().uuid(),
+  waterId: z.string().uuid(),
+  lessorName: z.string().min(1),
+  lessorAddress: z.string().optional(),
+  lessorPhone: z.string().optional(),
+  lessorEmail: z.string().optional(),
+  startDate: z.string(),
+  endDate: z.string().optional(),
+  durationYears: z.number().int().optional(),
+  initialAmount: z.number().min(0),
+  fixedAnnualIncrease: z.number().default(0),
+  percentageAnnualIncrease: z.number().default(0),
+  paymentMethod: leasePaymentMethodSchema.default('ueberweisung'),
+  accountHolder: z.string().optional(),
+  iban: z.string().optional(),
+  bic: z.string().optional(),
+  locationDetails: z.string().optional(),
+  specialAgreements: z.string().optional(),
+  isArchived: z.boolean().default(false),
+});
+
+export const UpdateLeaseSchema = CreateLeaseSchema.partial().extend({
+  leaseId: z.string().uuid(),
+});
+
+export type CreateLeaseInput = z.infer<typeof CreateLeaseSchema>;
+export type UpdateLeaseInput = z.infer<typeof UpdateLeaseSchema>;
+
+// =====================================================
+// Catch Books
+// =====================================================
+
+export const CreateCatchBookSchema = z.object({
+  accountId: z.string().uuid(),
+  memberId: z.string().uuid(),
+  year: z.number().int().min(1900).max(2100),
+  memberName: z.string().optional(),
+  memberBirthDate: z.string().optional(),
+  fishingDaysCount: z.number().int().default(0),
+  cardNumbers: z.string().optional(),
+  isFlyFisher: z.boolean().default(false),
+  isHejfish: z.boolean().default(false),
+  isEmpty: z.boolean().default(false),
+  notFished: z.boolean().default(false),
+  remarks: z.string().optional(),
+});
+
+export const UpdateCatchBookSchema = CreateCatchBookSchema.partial().extend({
+  catchBookId: z.string().uuid(),
+  status: catchBookStatusSchema.optional(),
+  verification: catchBookVerificationSchema.optional(),
+  isChecked: z.boolean().optional(),
+  isSubmitted: z.boolean().optional(),
+});
+
+export type CreateCatchBookInput = z.infer<typeof CreateCatchBookSchema>;
+export type UpdateCatchBookInput = z.infer<typeof UpdateCatchBookSchema>;
+
+// =====================================================
+// Catches
+// =====================================================
+
+export const CreateCatchSchema = z.object({
+  catchBookId: z.string().uuid(),
+  speciesId: z.string().uuid(),
+  waterId: z.string().uuid().optional(),
+  memberId: z.string().uuid().optional(),
+  catchDate: z.string(),
+  quantity: z.number().int().default(1),
+  lengthCm: z.number().optional(),
+  weightG: z.number().optional(),
+  sizeCategory: fishSizeCategorySchema.optional(),
+  gender: fishGenderSchema.optional(),
+  isEmptyEntry: z.boolean().default(false),
+  hasError: z.boolean().default(false),
+  hejfishId: z.string().optional(),
+  competitionId: z.string().uuid().optional(),
+  competitionParticipantId: z.string().uuid().optional(),
+  permitId: z.string().uuid().optional(),
+  remarks: z.string().optional(),
+});
+
+export type CreateCatchInput = z.infer<typeof CreateCatchSchema>;
+
+// =====================================================
+// Permits
+// =====================================================
+
+export const CreatePermitSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1),
+  shortCode: z.string().optional(),
+  primaryWaterId: z.string().uuid().optional(),
+  totalQuantity: z.number().int().optional(),
+  costCenterId: z.string().uuid().optional(),
+  hejfishId: z.string().optional(),
+  isForSale: z.boolean().default(true),
+  isArchived: z.boolean().default(false),
+});
+
+export const UpdatePermitSchema = CreatePermitSchema.partial().extend({
+  permitId: z.string().uuid(),
+});
+
+export type CreatePermitInput = z.infer<typeof CreatePermitSchema>;
+export type UpdatePermitInput = z.infer<typeof UpdatePermitSchema>;
+
+// =====================================================
+// Inspector Assignments
+// =====================================================
+
+export const CreateInspectorAssignmentSchema = z.object({
+  accountId: z.string().uuid(),
+  waterId: z.string().uuid(),
+  memberId: z.string().uuid(),
+  assignmentStart: z.string().default(() => new Date().toISOString().split('T')[0]!),
+  assignmentEnd: z.string().optional(),
+});
+
+export type CreateInspectorAssignmentInput = z.infer<
+  typeof CreateInspectorAssignmentSchema
+>;
+
+// =====================================================
+// Competitions
+// =====================================================
+
+export const CreateCompetitionSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1),
+  competitionDate: z.string(),
+  eventId: z.string().uuid().optional(),
+  permitId: z.string().uuid().optional(),
+  waterId: z.string().uuid().optional(),
+  maxParticipants: z.number().int().optional(),
+  scoreByCount: z.boolean().default(false),
+  scoreByHeaviest: z.boolean().default(false),
+  scoreByTotalWeight: z.boolean().default(true),
+  scoreByLongest: z.boolean().default(false),
+  scoreByTotalLength: z.boolean().default(false),
+  separateMemberGuestScoring: z.boolean().default(false),
+  resultCountWeight: z.number().int().default(3),
+  resultCountLength: z.number().int().default(3),
+  resultCountCount: z.number().int().default(3),
+});
+
+export const UpdateCompetitionSchema = CreateCompetitionSchema.partial().extend({
+  competitionId: z.string().uuid(),
+});
+
+export type CreateCompetitionInput = z.infer<typeof CreateCompetitionSchema>;
+export type UpdateCompetitionInput = z.infer<typeof UpdateCompetitionSchema>;
+
+// =====================================================
+// Competition Participants
+// =====================================================
+
+export const CreateCompetitionParticipantSchema = z.object({
+  competitionId: z.string().uuid(),
+  memberId: z.string().uuid().optional(),
+  categoryId: z.string().uuid().optional(),
+  participantName: z.string().min(1),
+  birthDate: z.string().optional(),
+  address: z.string().optional(),
+  phone: z.string().optional(),
+  email: z.string().optional(),
+});
+
+export type CreateCompetitionParticipantInput = z.infer<
+  typeof CreateCompetitionParticipantSchema
+>;
+
+// =====================================================
+// Suppliers
+// =====================================================
+
+export const CreateSupplierSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1),
+  contactPerson: z.string().optional(),
+  phone: z.string().optional(),
+  email: z.string().optional(),
+  address: z.string().optional(),
+  notes: z.string().optional(),
+  isActive: z.boolean().default(true),
+});
+
+export const UpdateSupplierSchema = CreateSupplierSchema.partial().extend({
+  supplierId: z.string().uuid(),
+});
+
+export type CreateSupplierInput = z.infer<typeof CreateSupplierSchema>;
+export type UpdateSupplierInput = z.infer<typeof UpdateSupplierSchema>;
+
+// =====================================================
+// Export & Statistics Filter
+// =====================================================
+
+export const FischereiExportSchema = z.object({
+  accountId: z.string().uuid(),
+  entityType: z.enum([
+    'stocking',
+    'catches',
+    'waters',
+    'species',
+    'leases',
+    'permits',
+    'competitions',
+  ]),
+  year: z.number().int().optional(),
+  format: z.enum(['csv', 'excel']),
+});
+
+export const CatchStatisticsFilterSchema = z.object({
+  accountId: z.string().uuid(),
+  year: z.number().int().optional(),
+  waterId: z.string().uuid().optional(),
+});
+
+export type FischereiExportInput = z.infer<typeof FischereiExportSchema>;
+export type CatchStatisticsFilterInput = z.infer<typeof CatchStatisticsFilterSchema>;
diff --git a/packages/features/fischerei/src/server/actions/fischerei-actions.ts b/packages/features/fischerei/src/server/actions/fischerei-actions.ts
new file mode 100644
index 000000000..c9b813715
--- /dev/null
+++ b/packages/features/fischerei/src/server/actions/fischerei-actions.ts
@@ -0,0 +1,673 @@
+'use server';
+
+import { z } from 'zod';
+import { revalidatePath } from 'next/cache';
+import { authActionClient } from '@kit/next/safe-action';
+import { getLogger } from '@kit/shared/logger';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+
+import {
+  CreateWaterSchema,
+  UpdateWaterSchema,
+  CreateFishSpeciesSchema,
+  UpdateFishSpeciesSchema,
+  CreateWaterSpeciesRuleSchema,
+  CreateStockingSchema,
+  UpdateStockingSchema,
+  CreateLeaseSchema,
+  UpdateLeaseSchema,
+  CreateCatchBookSchema,
+  UpdateCatchBookSchema,
+  CreateCatchSchema,
+  CreatePermitSchema,
+  UpdatePermitSchema,
+  CreateInspectorAssignmentSchema,
+  CreateCompetitionSchema,
+  UpdateCompetitionSchema,
+  CreateCompetitionParticipantSchema,
+  CreateSupplierSchema,
+  UpdateSupplierSchema,
+  catchBookStatusSchema,
+  catchBookVerificationSchema,
+} from '../../schema/fischerei.schema';
+
+import { createFischereiApi } from '../api';
+
+// =====================================================
+// Waters
+// =====================================================
+
+export const createWater = authActionClient
+  .inputSchema(CreateWaterSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.water.create' }, 'Creating water...');
+    const result = await api.createWater(input, userId);
+    logger.info({ name: 'fischerei.water.create' }, 'Water created');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updateWater = authActionClient
+  .inputSchema(UpdateWaterSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.water.update' }, 'Updating water...');
+    const result = await api.updateWater(input, userId);
+    logger.info({ name: 'fischerei.water.update' }, 'Water updated');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteWater = authActionClient
+  .inputSchema(
+    z.object({
+      waterId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.water.delete' }, 'Archiving water...');
+    await api.deleteWater(input.waterId);
+    logger.info({ name: 'fischerei.water.delete' }, 'Water archived');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Species
+// =====================================================
+
+export const createSpecies = authActionClient
+  .inputSchema(CreateFishSpeciesSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.species.create' }, 'Creating species...');
+    const result = await api.createSpecies(input);
+    logger.info({ name: 'fischerei.species.create' }, 'Species created');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updateSpecies = authActionClient
+  .inputSchema(UpdateFishSpeciesSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.species.update' }, 'Updating species...');
+    const result = await api.updateSpecies(input);
+    logger.info({ name: 'fischerei.species.update' }, 'Species updated');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteSpecies = authActionClient
+  .inputSchema(
+    z.object({
+      speciesId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.species.delete' }, 'Deleting species...');
+    await api.deleteSpecies(input.speciesId);
+    logger.info({ name: 'fischerei.species.delete' }, 'Species deleted');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Water-Species Rules
+// =====================================================
+
+export const upsertWaterSpeciesRule = authActionClient
+  .inputSchema(CreateWaterSpeciesRuleSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info(
+      { name: 'fischerei.waterSpeciesRule.upsert' },
+      'Upserting water species rule...',
+    );
+    const result = await api.upsertWaterSpeciesRule(input);
+    logger.info(
+      { name: 'fischerei.waterSpeciesRule.upsert' },
+      'Water species rule upserted',
+    );
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteWaterSpeciesRule = authActionClient
+  .inputSchema(
+    z.object({
+      ruleId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info(
+      { name: 'fischerei.waterSpeciesRule.delete' },
+      'Deleting water species rule...',
+    );
+    await api.deleteWaterSpeciesRule(input.ruleId);
+    logger.info(
+      { name: 'fischerei.waterSpeciesRule.delete' },
+      'Water species rule deleted',
+    );
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Stocking
+// =====================================================
+
+export const createStocking = authActionClient
+  .inputSchema(CreateStockingSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.stocking.create' }, 'Creating stocking entry...');
+    const result = await api.createStocking(input, userId);
+    logger.info({ name: 'fischerei.stocking.create' }, 'Stocking entry created');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updateStocking = authActionClient
+  .inputSchema(UpdateStockingSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.stocking.update' }, 'Updating stocking entry...');
+    const result = await api.updateStocking(input, userId);
+    logger.info({ name: 'fischerei.stocking.update' }, 'Stocking entry updated');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteStocking = authActionClient
+  .inputSchema(
+    z.object({
+      stockingId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.stocking.delete' }, 'Deleting stocking entry...');
+    await api.deleteStocking(input.stockingId);
+    logger.info({ name: 'fischerei.stocking.delete' }, 'Stocking entry deleted');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Leases
+// =====================================================
+
+export const createLease = authActionClient
+  .inputSchema(CreateLeaseSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.lease.create' }, 'Creating lease...');
+    const result = await api.createLease(input, userId);
+    logger.info({ name: 'fischerei.lease.create' }, 'Lease created');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updateLease = authActionClient
+  .inputSchema(UpdateLeaseSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.lease.update' }, 'Updating lease...');
+    const result = await api.updateLease(input, userId);
+    logger.info({ name: 'fischerei.lease.update' }, 'Lease updated');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+// =====================================================
+// Catch Books
+// =====================================================
+
+export const createCatchBook = authActionClient
+  .inputSchema(CreateCatchBookSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.catchBook.create' }, 'Creating catch book...');
+    const result = await api.createCatchBook(input, userId);
+    logger.info({ name: 'fischerei.catchBook.create' }, 'Catch book created');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updateCatchBook = authActionClient
+  .inputSchema(UpdateCatchBookSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.catchBook.update' }, 'Updating catch book...');
+    const result = await api.updateCatchBook(input, userId);
+    logger.info({ name: 'fischerei.catchBook.update' }, 'Catch book updated');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const submitCatchBook = authActionClient
+  .inputSchema(
+    z.object({
+      catchBookId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'fischerei.catchBook.submit' }, 'Submitting catch book...');
+    const result = await api.submitCatchBook(input.catchBookId, userId);
+    logger.info({ name: 'fischerei.catchBook.submit' }, 'Catch book submitted');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const reviewCatchBook = authActionClient
+  .inputSchema(
+    z.object({
+      catchBookId: z.string().uuid(),
+      accountId: z.string().uuid(),
+      status: z.enum(['akzeptiert', 'abgelehnt']),
+      verification: catchBookVerificationSchema.optional(),
+      remarks: z.string().optional(),
+    }),
+  )
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info(
+      { name: 'fischerei.catchBook.review' },
+      `Reviewing catch book (${input.status})...`,
+    );
+    const result = await api.reviewCatchBook(
+      input.catchBookId,
+      userId,
+      input.status,
+      input.verification,
+      input.remarks,
+    );
+    logger.info({ name: 'fischerei.catchBook.review' }, 'Catch book reviewed');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+// =====================================================
+// Catches
+// =====================================================
+
+export const createCatch = authActionClient
+  .inputSchema(CreateCatchSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.catch.create' }, 'Creating catch entry...');
+    const result = await api.createCatch(input);
+    logger.info({ name: 'fischerei.catch.create' }, 'Catch entry created');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updateCatch = authActionClient
+  .inputSchema(
+    CreateCatchSchema.partial().extend({
+      catchId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    const { catchId, ...updates } = input;
+    logger.info({ name: 'fischerei.catch.update' }, 'Updating catch entry...');
+    const result = await api.updateCatch(catchId, updates);
+    logger.info({ name: 'fischerei.catch.update' }, 'Catch entry updated');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteCatch = authActionClient
+  .inputSchema(
+    z.object({
+      catchId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.catch.delete' }, 'Deleting catch entry...');
+    await api.deleteCatch(input.catchId);
+    logger.info({ name: 'fischerei.catch.delete' }, 'Catch entry deleted');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Permits
+// =====================================================
+
+export const createPermit = authActionClient
+  .inputSchema(CreatePermitSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.permit.create' }, 'Creating permit...');
+    const result = await api.createPermit(input);
+    logger.info({ name: 'fischerei.permit.create' }, 'Permit created');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updatePermit = authActionClient
+  .inputSchema(UpdatePermitSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.permit.update' }, 'Updating permit...');
+    const result = await api.updatePermit(input);
+    logger.info({ name: 'fischerei.permit.update' }, 'Permit updated');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+// =====================================================
+// Inspectors
+// =====================================================
+
+export const assignInspector = authActionClient
+  .inputSchema(CreateInspectorAssignmentSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.inspector.assign' }, 'Assigning inspector...');
+    const result = await api.assignInspector(input);
+    logger.info({ name: 'fischerei.inspector.assign' }, 'Inspector assigned');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const removeInspector = authActionClient
+  .inputSchema(
+    z.object({
+      inspectorId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.inspector.remove' }, 'Removing inspector...');
+    await api.removeInspector(input.inspectorId);
+    logger.info({ name: 'fischerei.inspector.remove' }, 'Inspector removed');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Competitions
+// =====================================================
+
+export const createCompetition = authActionClient
+  .inputSchema(CreateCompetitionSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info(
+      { name: 'fischerei.competition.create' },
+      'Creating competition...',
+    );
+    const result = await api.createCompetition(input, userId);
+    logger.info(
+      { name: 'fischerei.competition.create' },
+      'Competition created',
+    );
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updateCompetition = authActionClient
+  .inputSchema(UpdateCompetitionSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+    const userId = ctx.user.id;
+
+    logger.info(
+      { name: 'fischerei.competition.update' },
+      'Updating competition...',
+    );
+    const result = await api.updateCompetition(input, userId);
+    logger.info(
+      { name: 'fischerei.competition.update' },
+      'Competition updated',
+    );
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteCompetition = authActionClient
+  .inputSchema(
+    z.object({
+      competitionId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info(
+      { name: 'fischerei.competition.delete' },
+      'Deleting competition...',
+    );
+    await api.deleteCompetition(input.competitionId);
+    logger.info(
+      { name: 'fischerei.competition.delete' },
+      'Competition deleted',
+    );
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
+
+export const addCompetitionParticipant = authActionClient
+  .inputSchema(CreateCompetitionParticipantSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info(
+      { name: 'fischerei.competition.addParticipant' },
+      'Adding participant...',
+    );
+    const result = await api.addParticipant(input);
+    logger.info(
+      { name: 'fischerei.competition.addParticipant' },
+      'Participant added',
+    );
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const removeCompetitionParticipant = authActionClient
+  .inputSchema(
+    z.object({
+      participantId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info(
+      { name: 'fischerei.competition.removeParticipant' },
+      'Removing participant...',
+    );
+    await api.removeParticipant(input.participantId);
+    logger.info(
+      { name: 'fischerei.competition.removeParticipant' },
+      'Participant removed',
+    );
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
+
+export const computeCompetitionResults = authActionClient
+  .inputSchema(
+    z.object({
+      competitionId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info(
+      { name: 'fischerei.competition.computeResults' },
+      'Computing competition results...',
+    );
+    const results = await api.computeCompetitionResults(input.competitionId);
+    logger.info(
+      { name: 'fischerei.competition.computeResults' },
+      'Competition results computed',
+    );
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: results };
+  });
+
+// =====================================================
+// Suppliers
+// =====================================================
+
+export const createSupplier = authActionClient
+  .inputSchema(CreateSupplierSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.supplier.create' }, 'Creating supplier...');
+    const result = await api.createSupplier(input);
+    logger.info({ name: 'fischerei.supplier.create' }, 'Supplier created');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const updateSupplier = authActionClient
+  .inputSchema(UpdateSupplierSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.supplier.update' }, 'Updating supplier...');
+    const result = await api.updateSupplier(input);
+    logger.info({ name: 'fischerei.supplier.update' }, 'Supplier updated');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteSupplier = authActionClient
+  .inputSchema(
+    z.object({
+      supplierId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createFischereiApi(client);
+
+    logger.info({ name: 'fischerei.supplier.delete' }, 'Deleting supplier...');
+    await api.deleteSupplier(input.supplierId);
+    logger.info({ name: 'fischerei.supplier.delete' }, 'Supplier deleted');
+    revalidatePath('/home/[account]/fischerei', 'page');
+    return { success: true };
+  });
diff --git a/packages/features/fischerei/src/server/api.ts b/packages/features/fischerei/src/server/api.ts
new file mode 100644
index 000000000..9ec9371ca
--- /dev/null
+++ b/packages/features/fischerei/src/server/api.ts
@@ -0,0 +1,1458 @@
+import type { Database } from '@kit/supabase/database';
+import type { SupabaseClient } from '@supabase/supabase-js';
+
+import type {
+  CreateWaterInput,
+  UpdateWaterInput,
+  CreateFishSpeciesInput,
+  UpdateFishSpeciesInput,
+  CreateWaterSpeciesRuleInput,
+  CreateStockingInput,
+  UpdateStockingInput,
+  CreateLeaseInput,
+  UpdateLeaseInput,
+  CreateCatchBookInput,
+  UpdateCatchBookInput,
+  CreateCatchInput,
+  CreatePermitInput,
+  UpdatePermitInput,
+  CreateInspectorAssignmentInput,
+  CreateCompetitionInput,
+  UpdateCompetitionInput,
+  CreateCompetitionParticipantInput,
+  CreateSupplierInput,
+  UpdateSupplierInput,
+} from '../schema/fischerei.schema';
+
+/**
+ * Factory for the Fischerei (Fishing Association Management) API.
+ */
+export function createFischereiApi(client: SupabaseClient<Database>) {
+  return {
+    // =====================================================
+    // Waters
+    // =====================================================
+
+    async listWaters(
+      accountId: string,
+      opts?: {
+        search?: string;
+        waterType?: string;
+        archived?: boolean;
+        page?: number;
+        pageSize?: number;
+      },
+    ) {
+      let query = client
+        .from('waters')
+        .select(
+          'id, name, short_name, water_type, description, surface_area_ha, length_m, width_m, avg_depth_m, max_depth_m, outflow, location, county, geo_lat, geo_lng, lfv_number, lfv_name, cost_center_id, hejfish_id, is_archived, created_at, updated_at',
+          { count: 'exact' },
+        )
+        .eq('account_id', accountId)
+        .order('name');
+
+      if (opts?.search) {
+        query = query.or(
+          `name.ilike.%${opts.search}%,short_name.ilike.%${opts.search}%,location.ilike.%${opts.search}%`,
+        );
+      }
+
+      if (opts?.waterType) {
+        query = query.eq(
+          'water_type',
+          opts.waterType as Database['public']['Enums']['water_type'],
+        );
+      }
+
+      if (opts?.archived !== undefined) {
+        query = query.eq('is_archived', opts.archived);
+      } else {
+        // By default, hide archived
+        query = query.eq('is_archived', false);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 25;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async getWater(waterId: string) {
+      const { data, error } = await client
+        .from('waters')
+        .select('*')
+        .eq('id', waterId)
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async createWater(input: CreateWaterInput, userId: string) {
+      const { data, error } = await client
+        .from('waters')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          short_name: input.shortName,
+          water_type: input.waterType,
+          description: input.description,
+          surface_area_ha: input.surfaceAreaHa,
+          length_m: input.lengthM,
+          width_m: input.widthM,
+          avg_depth_m: input.avgDepthM,
+          max_depth_m: input.maxDepthM,
+          outflow: input.outflow,
+          location: input.location,
+          classification_order: input.classificationOrder,
+          county: input.county,
+          geo_lat: input.geoLat,
+          geo_lng: input.geoLng,
+          lfv_number: input.lfvNumber,
+          lfv_name: input.lfvName,
+          cost_share_ds: input.costShareDs,
+          cost_share_kalk: input.costShareKalk,
+          electrofishing_permit_requested: input.electrofishingPermitRequested,
+          hejfish_id: input.hejfishId,
+          cost_center_id: input.costCenterId,
+          is_archived: input.isArchived,
+          created_by: userId,
+          updated_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateWater(input: UpdateWaterInput, userId: string) {
+      const updateData: Record<string, unknown> = { updated_by: userId };
+
+      if (input.name !== undefined) updateData.name = input.name;
+      if (input.shortName !== undefined) updateData.short_name = input.shortName;
+      if (input.waterType !== undefined) updateData.water_type = input.waterType;
+      if (input.description !== undefined)
+        updateData.description = input.description;
+      if (input.surfaceAreaHa !== undefined)
+        updateData.surface_area_ha = input.surfaceAreaHa;
+      if (input.lengthM !== undefined) updateData.length_m = input.lengthM;
+      if (input.widthM !== undefined) updateData.width_m = input.widthM;
+      if (input.avgDepthM !== undefined)
+        updateData.avg_depth_m = input.avgDepthM;
+      if (input.maxDepthM !== undefined)
+        updateData.max_depth_m = input.maxDepthM;
+      if (input.outflow !== undefined) updateData.outflow = input.outflow;
+      if (input.location !== undefined) updateData.location = input.location;
+      if (input.classificationOrder !== undefined)
+        updateData.classification_order = input.classificationOrder;
+      if (input.county !== undefined) updateData.county = input.county;
+      if (input.geoLat !== undefined) updateData.geo_lat = input.geoLat;
+      if (input.geoLng !== undefined) updateData.geo_lng = input.geoLng;
+      if (input.lfvNumber !== undefined)
+        updateData.lfv_number = input.lfvNumber;
+      if (input.lfvName !== undefined) updateData.lfv_name = input.lfvName;
+      if (input.costShareDs !== undefined)
+        updateData.cost_share_ds = input.costShareDs;
+      if (input.costShareKalk !== undefined)
+        updateData.cost_share_kalk = input.costShareKalk;
+      if (input.electrofishingPermitRequested !== undefined)
+        updateData.electrofishing_permit_requested =
+          input.electrofishingPermitRequested;
+      if (input.hejfishId !== undefined)
+        updateData.hejfish_id = input.hejfishId;
+      if (input.costCenterId !== undefined)
+        updateData.cost_center_id = input.costCenterId;
+      if (input.isArchived !== undefined)
+        updateData.is_archived = input.isArchived;
+
+      const { data, error } = await client
+        .from('waters')
+        .update(updateData)
+        .eq('id', input.waterId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteWater(waterId: string) {
+      // Soft delete — set is_archived = true
+      const { error } = await client
+        .from('waters')
+        .update({ is_archived: true })
+        .eq('id', waterId);
+      if (error) throw error;
+    },
+
+    async getWaterDetail(waterId: string) {
+      // Fetch water + related data in parallel
+      const [waterResult, rulesResult, leasesResult, inspectorsResult, stockingResult] =
+        await Promise.all([
+          client.from('waters').select('*').eq('id', waterId).single(),
+          client
+            .from('water_species_rules')
+            .select(
+              'id, water_id, species_id, min_size_cm, protection_period_start, protection_period_end, max_catch_per_day, max_catch_per_year, created_at, fish_species ( id, name, name_latin )',
+            )
+            .eq('water_id', waterId),
+          client
+            .from('fishing_leases')
+            .select(
+              'id, lessor_name, start_date, end_date, initial_amount, fixed_annual_increase, percentage_annual_increase, payment_method, is_archived',
+            )
+            .eq('water_id', waterId)
+            .order('start_date', { ascending: false }),
+          client
+            .from('water_inspectors')
+            .select(
+              'id, water_id, member_id, assignment_start, assignment_end, created_at, members ( id, first_name, last_name )',
+            )
+            .eq('water_id', waterId),
+          client
+            .from('fish_stocking')
+            .select(
+              'id, stocking_date, quantity, weight_kg, age_class, cost_euros, remarks, fish_species ( id, name ), fish_suppliers ( id, name )',
+            )
+            .eq('water_id', waterId)
+            .order('stocking_date', { ascending: false })
+            .limit(20),
+        ]);
+
+      if (waterResult.error) throw waterResult.error;
+
+      return {
+        water: waterResult.data,
+        speciesRules: rulesResult.data ?? [],
+        leases: leasesResult.data ?? [],
+        inspectors: inspectorsResult.data ?? [],
+        stockingHistory: stockingResult.data ?? [],
+      };
+    },
+
+    // =====================================================
+    // Fish Species
+    // =====================================================
+
+    async listSpecies(
+      accountId: string,
+      opts?: {
+        search?: string;
+        active?: boolean;
+        page?: number;
+        pageSize?: number;
+      },
+    ) {
+      let query = client
+        .from('fish_species')
+        .select(
+          'id, name, name_latin, name_local, is_active, max_age_years, max_weight_kg, max_length_cm, protected_min_size_cm, protection_period_start, protection_period_end, spawning_season_start, spawning_season_end, has_special_spawning_season, k_factor_avg, k_factor_min, k_factor_max, price_per_unit, max_catch_per_day, max_catch_per_year, individual_recording, sort_order, created_at, updated_at',
+          { count: 'exact' },
+        )
+        .eq('account_id', accountId)
+        .order('sort_order')
+        .order('name');
+
+      if (opts?.search) {
+        query = query.or(
+          `name.ilike.%${opts.search}%,name_latin.ilike.%${opts.search}%,name_local.ilike.%${opts.search}%`,
+        );
+      }
+
+      if (opts?.active !== undefined) {
+        query = query.eq('is_active', opts.active);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 50;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async getSpecies(speciesId: string) {
+      const { data, error } = await client
+        .from('fish_species')
+        .select('*')
+        .eq('id', speciesId)
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async createSpecies(input: CreateFishSpeciesInput) {
+      const { data, error } = await client
+        .from('fish_species')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          name_latin: input.nameLatin,
+          name_local: input.nameLocal,
+          is_active: input.isActive,
+          max_age_years: input.maxAgeYears,
+          max_weight_kg: input.maxWeightKg,
+          max_length_cm: input.maxLengthCm,
+          protected_min_size_cm: input.protectedMinSizeCm,
+          protection_period_start: input.protectionPeriodStart,
+          protection_period_end: input.protectionPeriodEnd,
+          spawning_season_start: input.spawningSeasonStart,
+          spawning_season_end: input.spawningSeasonEnd,
+          has_special_spawning_season: input.hasSpecialSpawningSeason,
+          k_factor_avg: input.kFactorAvg,
+          k_factor_min: input.kFactorMin,
+          k_factor_max: input.kFactorMax,
+          price_per_unit: input.pricePerUnit,
+          max_catch_per_day: input.maxCatchPerDay,
+          max_catch_per_year: input.maxCatchPerYear,
+          individual_recording: input.individualRecording,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateSpecies(input: UpdateFishSpeciesInput) {
+      const updateData: Record<string, unknown> = {};
+
+      if (input.name !== undefined) updateData.name = input.name;
+      if (input.nameLatin !== undefined)
+        updateData.name_latin = input.nameLatin;
+      if (input.nameLocal !== undefined)
+        updateData.name_local = input.nameLocal;
+      if (input.isActive !== undefined) updateData.is_active = input.isActive;
+      if (input.maxAgeYears !== undefined)
+        updateData.max_age_years = input.maxAgeYears;
+      if (input.maxWeightKg !== undefined)
+        updateData.max_weight_kg = input.maxWeightKg;
+      if (input.maxLengthCm !== undefined)
+        updateData.max_length_cm = input.maxLengthCm;
+      if (input.protectedMinSizeCm !== undefined)
+        updateData.protected_min_size_cm = input.protectedMinSizeCm;
+      if (input.protectionPeriodStart !== undefined)
+        updateData.protection_period_start = input.protectionPeriodStart;
+      if (input.protectionPeriodEnd !== undefined)
+        updateData.protection_period_end = input.protectionPeriodEnd;
+      if (input.spawningSeasonStart !== undefined)
+        updateData.spawning_season_start = input.spawningSeasonStart;
+      if (input.spawningSeasonEnd !== undefined)
+        updateData.spawning_season_end = input.spawningSeasonEnd;
+      if (input.hasSpecialSpawningSeason !== undefined)
+        updateData.has_special_spawning_season =
+          input.hasSpecialSpawningSeason;
+      if (input.kFactorAvg !== undefined)
+        updateData.k_factor_avg = input.kFactorAvg;
+      if (input.kFactorMin !== undefined)
+        updateData.k_factor_min = input.kFactorMin;
+      if (input.kFactorMax !== undefined)
+        updateData.k_factor_max = input.kFactorMax;
+      if (input.pricePerUnit !== undefined)
+        updateData.price_per_unit = input.pricePerUnit;
+      if (input.maxCatchPerDay !== undefined)
+        updateData.max_catch_per_day = input.maxCatchPerDay;
+      if (input.maxCatchPerYear !== undefined)
+        updateData.max_catch_per_year = input.maxCatchPerYear;
+      if (input.individualRecording !== undefined)
+        updateData.individual_recording = input.individualRecording;
+
+      const { data, error } = await client
+        .from('fish_species')
+        .update(updateData)
+        .eq('id', input.speciesId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteSpecies(speciesId: string) {
+      // Hard delete — will fail if catches reference it (RESTRICT FK)
+      const { error } = await client
+        .from('fish_species')
+        .delete()
+        .eq('id', speciesId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Water-Species Rules
+    // =====================================================
+
+    async listWaterSpeciesRules(waterId: string) {
+      const { data, error } = await client
+        .from('water_species_rules')
+        .select(
+          'id, water_id, species_id, min_size_cm, protection_period_start, protection_period_end, max_catch_per_day, max_catch_per_year, created_at, fish_species ( id, name, name_latin )',
+        )
+        .eq('water_id', waterId);
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async upsertWaterSpeciesRule(input: CreateWaterSpeciesRuleInput) {
+      const { data, error } = await client
+        .from('water_species_rules')
+        .upsert(
+          {
+            water_id: input.waterId,
+            species_id: input.speciesId,
+            min_size_cm: input.minSizeCm,
+            protection_period_start: input.protectionPeriodStart,
+            protection_period_end: input.protectionPeriodEnd,
+            max_catch_per_day: input.maxCatchPerDay,
+            max_catch_per_year: input.maxCatchPerYear,
+          },
+          { onConflict: 'water_id,species_id' },
+        )
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteWaterSpeciesRule(ruleId: string) {
+      const { error } = await client
+        .from('water_species_rules')
+        .delete()
+        .eq('id', ruleId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Stocking
+    // =====================================================
+
+    async listStocking(
+      accountId: string,
+      opts?: {
+        waterId?: string;
+        speciesId?: string;
+        year?: number;
+        page?: number;
+        pageSize?: number;
+      },
+    ) {
+      let query = client
+        .from('fish_stocking')
+        .select(
+          'id, water_id, species_id, stocking_date, quantity, weight_kg, age_class, cost_euros, supplier_id, remarks, created_at, waters ( id, name ), fish_species ( id, name ), fish_suppliers ( id, name )',
+          { count: 'exact' },
+        )
+        .eq('account_id', accountId)
+        .order('stocking_date', { ascending: false });
+
+      if (opts?.waterId) {
+        query = query.eq('water_id', opts.waterId);
+      }
+      if (opts?.speciesId) {
+        query = query.eq('species_id', opts.speciesId);
+      }
+      if (opts?.year) {
+        query = query
+          .gte('stocking_date', `${opts.year}-01-01`)
+          .lte('stocking_date', `${opts.year}-12-31`);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 25;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async createStocking(input: CreateStockingInput, userId: string) {
+      const { data, error } = await client
+        .from('fish_stocking')
+        .insert({
+          account_id: input.accountId,
+          water_id: input.waterId,
+          species_id: input.speciesId,
+          stocking_date: input.stockingDate,
+          quantity: input.quantity,
+          weight_kg: input.weightKg,
+          age_class: input.ageClass,
+          cost_euros: input.costEuros,
+          supplier_id: input.supplierId,
+          remarks: input.remarks,
+          created_by: userId,
+          updated_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateStocking(input: UpdateStockingInput, userId: string) {
+      const updateData: Record<string, unknown> = { updated_by: userId };
+
+      if (input.waterId !== undefined) updateData.water_id = input.waterId;
+      if (input.speciesId !== undefined)
+        updateData.species_id = input.speciesId;
+      if (input.stockingDate !== undefined)
+        updateData.stocking_date = input.stockingDate;
+      if (input.quantity !== undefined) updateData.quantity = input.quantity;
+      if (input.weightKg !== undefined) updateData.weight_kg = input.weightKg;
+      if (input.ageClass !== undefined) updateData.age_class = input.ageClass;
+      if (input.costEuros !== undefined)
+        updateData.cost_euros = input.costEuros;
+      if (input.supplierId !== undefined)
+        updateData.supplier_id = input.supplierId;
+      if (input.remarks !== undefined) updateData.remarks = input.remarks;
+
+      const { data, error } = await client
+        .from('fish_stocking')
+        .update(updateData)
+        .eq('id', input.stockingId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteStocking(stockingId: string) {
+      const { error } = await client
+        .from('fish_stocking')
+        .delete()
+        .eq('id', stockingId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Leases
+    // =====================================================
+
+    async listLeases(
+      accountId: string,
+      opts?: {
+        waterId?: string;
+        active?: boolean;
+        page?: number;
+        pageSize?: number;
+      },
+    ) {
+      let query = client
+        .from('fishing_leases')
+        .select(
+          'id, water_id, lessor_name, lessor_address, lessor_phone, lessor_email, start_date, end_date, duration_years, initial_amount, fixed_annual_increase, percentage_annual_increase, payment_method, account_holder, iban, bic, location_details, special_agreements, is_archived, created_at, updated_at, waters ( id, name )',
+          { count: 'exact' },
+        )
+        .eq('account_id', accountId)
+        .order('start_date', { ascending: false });
+
+      if (opts?.waterId) {
+        query = query.eq('water_id', opts.waterId);
+      }
+      if (opts?.active) {
+        const today = new Date().toISOString().split('T')[0]!;
+        query = query
+          .eq('is_archived', false)
+          .or(`end_date.is.null,end_date.gte.${today}`);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 25;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async getLease(leaseId: string) {
+      const { data, error } = await client
+        .from('fishing_leases')
+        .select('*, waters ( id, name )')
+        .eq('id', leaseId)
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async createLease(input: CreateLeaseInput, userId: string) {
+      const { data, error } = await client
+        .from('fishing_leases')
+        .insert({
+          account_id: input.accountId,
+          water_id: input.waterId,
+          lessor_name: input.lessorName,
+          lessor_address: input.lessorAddress,
+          lessor_phone: input.lessorPhone,
+          lessor_email: input.lessorEmail,
+          start_date: input.startDate,
+          end_date: input.endDate,
+          duration_years: input.durationYears,
+          initial_amount: input.initialAmount,
+          fixed_annual_increase: input.fixedAnnualIncrease,
+          percentage_annual_increase: input.percentageAnnualIncrease,
+          payment_method: input.paymentMethod,
+          account_holder: input.accountHolder,
+          iban: input.iban,
+          bic: input.bic,
+          location_details: input.locationDetails,
+          special_agreements: input.specialAgreements,
+          is_archived: input.isArchived,
+          created_by: userId,
+          updated_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateLease(input: UpdateLeaseInput, userId: string) {
+      const updateData: Record<string, unknown> = { updated_by: userId };
+
+      if (input.waterId !== undefined) updateData.water_id = input.waterId;
+      if (input.lessorName !== undefined)
+        updateData.lessor_name = input.lessorName;
+      if (input.lessorAddress !== undefined)
+        updateData.lessor_address = input.lessorAddress;
+      if (input.lessorPhone !== undefined)
+        updateData.lessor_phone = input.lessorPhone;
+      if (input.lessorEmail !== undefined)
+        updateData.lessor_email = input.lessorEmail;
+      if (input.startDate !== undefined)
+        updateData.start_date = input.startDate;
+      if (input.endDate !== undefined) updateData.end_date = input.endDate;
+      if (input.durationYears !== undefined)
+        updateData.duration_years = input.durationYears;
+      if (input.initialAmount !== undefined)
+        updateData.initial_amount = input.initialAmount;
+      if (input.fixedAnnualIncrease !== undefined)
+        updateData.fixed_annual_increase = input.fixedAnnualIncrease;
+      if (input.percentageAnnualIncrease !== undefined)
+        updateData.percentage_annual_increase = input.percentageAnnualIncrease;
+      if (input.paymentMethod !== undefined)
+        updateData.payment_method = input.paymentMethod;
+      if (input.accountHolder !== undefined)
+        updateData.account_holder = input.accountHolder;
+      if (input.iban !== undefined) updateData.iban = input.iban;
+      if (input.bic !== undefined) updateData.bic = input.bic;
+      if (input.locationDetails !== undefined)
+        updateData.location_details = input.locationDetails;
+      if (input.specialAgreements !== undefined)
+        updateData.special_agreements = input.specialAgreements;
+      if (input.isArchived !== undefined)
+        updateData.is_archived = input.isArchived;
+
+      const { data, error } = await client
+        .from('fishing_leases')
+        .update(updateData)
+        .eq('id', input.leaseId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    // =====================================================
+    // Catch Books
+    // =====================================================
+
+    async listCatchBooks(
+      accountId: string,
+      opts?: {
+        year?: number;
+        status?: string;
+        memberId?: string;
+        search?: string;
+        page?: number;
+        pageSize?: number;
+      },
+    ) {
+      let query = client
+        .from('catch_books')
+        .select(
+          'id, member_id, year, member_name, member_birth_date, fishing_days_count, total_fish_caught, card_numbers, is_fly_fisher, status, verification, is_checked, is_submitted, submitted_at, is_hejfish, is_empty, not_fished, remarks, created_at, updated_at, members ( id, first_name, last_name )',
+          { count: 'exact' },
+        )
+        .eq('account_id', accountId)
+        .order('year', { ascending: false })
+        .order('member_name');
+
+      if (opts?.year) {
+        query = query.eq('year', opts.year);
+      }
+      if (opts?.status) {
+        query = query.eq(
+          'status',
+          opts.status as Database['public']['Enums']['catch_book_status'],
+        );
+      }
+      if (opts?.memberId) {
+        query = query.eq('member_id', opts.memberId);
+      }
+      if (opts?.search) {
+        query = query.ilike('member_name', `%${opts.search}%`);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 25;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async getCatchBook(catchBookId: string) {
+      const { data, error } = await client
+        .from('catch_books')
+        .select('*, members ( id, first_name, last_name )')
+        .eq('id', catchBookId)
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async createCatchBook(input: CreateCatchBookInput, userId: string) {
+      const { data, error } = await client
+        .from('catch_books')
+        .insert({
+          account_id: input.accountId,
+          member_id: input.memberId,
+          year: input.year,
+          member_name: input.memberName,
+          member_birth_date: input.memberBirthDate,
+          fishing_days_count: input.fishingDaysCount,
+          card_numbers: input.cardNumbers,
+          is_fly_fisher: input.isFlyFisher,
+          is_hejfish: input.isHejfish,
+          is_empty: input.isEmpty,
+          not_fished: input.notFished,
+          remarks: input.remarks,
+          created_by: userId,
+          updated_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateCatchBook(input: UpdateCatchBookInput, userId: string) {
+      const updateData: Record<string, unknown> = { updated_by: userId };
+
+      if (input.memberId !== undefined)
+        updateData.member_id = input.memberId;
+      if (input.year !== undefined) updateData.year = input.year;
+      if (input.memberName !== undefined)
+        updateData.member_name = input.memberName;
+      if (input.memberBirthDate !== undefined)
+        updateData.member_birth_date = input.memberBirthDate;
+      if (input.fishingDaysCount !== undefined)
+        updateData.fishing_days_count = input.fishingDaysCount;
+      if (input.cardNumbers !== undefined)
+        updateData.card_numbers = input.cardNumbers;
+      if (input.isFlyFisher !== undefined)
+        updateData.is_fly_fisher = input.isFlyFisher;
+      if (input.status !== undefined) updateData.status = input.status;
+      if (input.verification !== undefined)
+        updateData.verification = input.verification;
+      if (input.isChecked !== undefined)
+        updateData.is_checked = input.isChecked;
+      if (input.isSubmitted !== undefined)
+        updateData.is_submitted = input.isSubmitted;
+      if (input.isHejfish !== undefined)
+        updateData.is_hejfish = input.isHejfish;
+      if (input.isEmpty !== undefined) updateData.is_empty = input.isEmpty;
+      if (input.notFished !== undefined)
+        updateData.not_fished = input.notFished;
+      if (input.remarks !== undefined) updateData.remarks = input.remarks;
+
+      const { data, error } = await client
+        .from('catch_books')
+        .update(updateData)
+        .eq('id', input.catchBookId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async submitCatchBook(catchBookId: string, userId: string) {
+      const { data, error } = await client
+        .from('catch_books')
+        .update({
+          status: 'eingereicht' as Database['public']['Enums']['catch_book_status'],
+          is_submitted: true,
+          submitted_at: new Date().toISOString(),
+          updated_by: userId,
+        })
+        .eq('id', catchBookId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async reviewCatchBook(
+      catchBookId: string,
+      userId: string,
+      status: 'akzeptiert' | 'abgelehnt',
+      verification?: string,
+      remarks?: string,
+    ) {
+      const updateData: Record<string, unknown> = {
+        status: status as Database['public']['Enums']['catch_book_status'],
+        is_checked: true,
+        updated_by: userId,
+      };
+      if (verification !== undefined) updateData.verification = verification;
+      if (remarks !== undefined) updateData.remarks = remarks;
+
+      const { data, error } = await client
+        .from('catch_books')
+        .update(updateData)
+        .eq('id', catchBookId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    // =====================================================
+    // Catches
+    // =====================================================
+
+    async listCatches(
+      catchBookId: string,
+      opts?: { page?: number; pageSize?: number },
+    ) {
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 50;
+
+      const { data, error, count } = await client
+        .from('catches')
+        .select(
+          'id, catch_book_id, species_id, water_id, member_id, catch_date, quantity, length_cm, weight_g, size_category, gender, is_empty_entry, has_error, hejfish_id, competition_id, competition_participant_id, permit_id, remarks, created_at, fish_species ( id, name ), waters ( id, name )',
+          { count: 'exact' },
+        )
+        .eq('catch_book_id', catchBookId)
+        .order('catch_date', { ascending: false })
+        .range((page - 1) * pageSize, page * pageSize - 1);
+
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async createCatch(input: CreateCatchInput) {
+      const { data, error } = await client
+        .from('catches')
+        .insert({
+          catch_book_id: input.catchBookId,
+          species_id: input.speciesId,
+          water_id: input.waterId,
+          member_id: input.memberId,
+          catch_date: input.catchDate,
+          quantity: input.quantity,
+          length_cm: input.lengthCm,
+          weight_g: input.weightG,
+          size_category: input.sizeCategory,
+          gender: input.gender,
+          is_empty_entry: input.isEmptyEntry,
+          has_error: input.hasError,
+          hejfish_id: input.hejfishId,
+          competition_id: input.competitionId,
+          competition_participant_id: input.competitionParticipantId,
+          permit_id: input.permitId,
+          remarks: input.remarks,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateCatch(
+      catchId: string,
+      input: Partial<CreateCatchInput>,
+    ) {
+      const updateData: Record<string, unknown> = {};
+
+      if (input.speciesId !== undefined)
+        updateData.species_id = input.speciesId;
+      if (input.waterId !== undefined) updateData.water_id = input.waterId;
+      if (input.catchDate !== undefined)
+        updateData.catch_date = input.catchDate;
+      if (input.quantity !== undefined) updateData.quantity = input.quantity;
+      if (input.lengthCm !== undefined)
+        updateData.length_cm = input.lengthCm;
+      if (input.weightG !== undefined) updateData.weight_g = input.weightG;
+      if (input.sizeCategory !== undefined)
+        updateData.size_category = input.sizeCategory;
+      if (input.gender !== undefined) updateData.gender = input.gender;
+      if (input.isEmptyEntry !== undefined)
+        updateData.is_empty_entry = input.isEmptyEntry;
+      if (input.hasError !== undefined)
+        updateData.has_error = input.hasError;
+      if (input.remarks !== undefined) updateData.remarks = input.remarks;
+
+      const { data, error } = await client
+        .from('catches')
+        .update(updateData)
+        .eq('id', catchId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteCatch(catchId: string) {
+      const { error } = await client
+        .from('catches')
+        .delete()
+        .eq('id', catchId);
+      if (error) throw error;
+    },
+
+    async getCatchStatistics(
+      accountId: string,
+      year?: number,
+      waterId?: string,
+    ) {
+      const { data, error } = await client.rpc('get_catch_statistics', {
+        p_account_id: accountId,
+        p_year: year ?? null,
+        p_water_id: waterId ?? null,
+      });
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    // =====================================================
+    // Permits
+    // =====================================================
+
+    async listPermits(
+      accountId: string,
+      opts?: { archived?: boolean },
+    ) {
+      let query = client
+        .from('fishing_permits')
+        .select(
+          'id, name, short_code, primary_water_id, total_quantity, cost_center_id, hejfish_id, is_for_sale, is_archived, created_at, updated_at, waters ( id, name )',
+        )
+        .eq('account_id', accountId)
+        .order('name');
+
+      if (opts?.archived !== undefined) {
+        query = query.eq('is_archived', opts.archived);
+      } else {
+        query = query.eq('is_archived', false);
+      }
+
+      const { data, error } = await query;
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createPermit(input: CreatePermitInput) {
+      const { data, error } = await client
+        .from('fishing_permits')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          short_code: input.shortCode,
+          primary_water_id: input.primaryWaterId,
+          total_quantity: input.totalQuantity,
+          cost_center_id: input.costCenterId,
+          hejfish_id: input.hejfishId,
+          is_for_sale: input.isForSale,
+          is_archived: input.isArchived,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updatePermit(input: UpdatePermitInput) {
+      const updateData: Record<string, unknown> = {};
+
+      if (input.name !== undefined) updateData.name = input.name;
+      if (input.shortCode !== undefined)
+        updateData.short_code = input.shortCode;
+      if (input.primaryWaterId !== undefined)
+        updateData.primary_water_id = input.primaryWaterId;
+      if (input.totalQuantity !== undefined)
+        updateData.total_quantity = input.totalQuantity;
+      if (input.costCenterId !== undefined)
+        updateData.cost_center_id = input.costCenterId;
+      if (input.hejfishId !== undefined)
+        updateData.hejfish_id = input.hejfishId;
+      if (input.isForSale !== undefined)
+        updateData.is_for_sale = input.isForSale;
+      if (input.isArchived !== undefined)
+        updateData.is_archived = input.isArchived;
+
+      const { data, error } = await client
+        .from('fishing_permits')
+        .update(updateData)
+        .eq('id', input.permitId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    // =====================================================
+    // Inspectors
+    // =====================================================
+
+    async listInspectors(waterId: string) {
+      const { data, error } = await client
+        .from('water_inspectors')
+        .select(
+          'id, water_id, member_id, assignment_start, assignment_end, created_at, members ( id, first_name, last_name )',
+        )
+        .eq('water_id', waterId)
+        .order('assignment_start', { ascending: false });
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async assignInspector(input: CreateInspectorAssignmentInput) {
+      const { data, error } = await client
+        .from('water_inspectors')
+        .insert({
+          account_id: input.accountId,
+          water_id: input.waterId,
+          member_id: input.memberId,
+          assignment_start: input.assignmentStart,
+          assignment_end: input.assignmentEnd,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async removeInspector(inspectorId: string) {
+      const { error } = await client
+        .from('water_inspectors')
+        .delete()
+        .eq('id', inspectorId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Competitions
+    // =====================================================
+
+    async listCompetitions(
+      accountId: string,
+      opts?: { year?: number; page?: number; pageSize?: number },
+    ) {
+      let query = client
+        .from('competitions')
+        .select(
+          'id, name, competition_date, event_id, permit_id, water_id, max_participants, score_by_count, score_by_heaviest, score_by_total_weight, score_by_longest, score_by_total_length, separate_member_guest_scoring, result_count_weight, result_count_length, result_count_count, created_at, updated_at, waters ( id, name )',
+          { count: 'exact' },
+        )
+        .eq('account_id', accountId)
+        .order('competition_date', { ascending: false });
+
+      if (opts?.year) {
+        query = query
+          .gte('competition_date', `${opts.year}-01-01`)
+          .lte('competition_date', `${opts.year}-12-31`);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 25;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async getCompetition(competitionId: string) {
+      const { data, error } = await client
+        .from('competitions')
+        .select('*, waters ( id, name )')
+        .eq('id', competitionId)
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async createCompetition(input: CreateCompetitionInput, userId: string) {
+      const { data, error } = await client
+        .from('competitions')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          competition_date: input.competitionDate,
+          event_id: input.eventId,
+          permit_id: input.permitId,
+          water_id: input.waterId,
+          max_participants: input.maxParticipants,
+          score_by_count: input.scoreByCount,
+          score_by_heaviest: input.scoreByHeaviest,
+          score_by_total_weight: input.scoreByTotalWeight,
+          score_by_longest: input.scoreByLongest,
+          score_by_total_length: input.scoreByTotalLength,
+          separate_member_guest_scoring: input.separateMemberGuestScoring,
+          result_count_weight: input.resultCountWeight,
+          result_count_length: input.resultCountLength,
+          result_count_count: input.resultCountCount,
+          created_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateCompetition(input: UpdateCompetitionInput, userId: string) {
+      const updateData: Record<string, unknown> = {};
+
+      if (input.name !== undefined) updateData.name = input.name;
+      if (input.competitionDate !== undefined)
+        updateData.competition_date = input.competitionDate;
+      if (input.eventId !== undefined) updateData.event_id = input.eventId;
+      if (input.permitId !== undefined)
+        updateData.permit_id = input.permitId;
+      if (input.waterId !== undefined) updateData.water_id = input.waterId;
+      if (input.maxParticipants !== undefined)
+        updateData.max_participants = input.maxParticipants;
+      if (input.scoreByCount !== undefined)
+        updateData.score_by_count = input.scoreByCount;
+      if (input.scoreByHeaviest !== undefined)
+        updateData.score_by_heaviest = input.scoreByHeaviest;
+      if (input.scoreByTotalWeight !== undefined)
+        updateData.score_by_total_weight = input.scoreByTotalWeight;
+      if (input.scoreByLongest !== undefined)
+        updateData.score_by_longest = input.scoreByLongest;
+      if (input.scoreByTotalLength !== undefined)
+        updateData.score_by_total_length = input.scoreByTotalLength;
+      if (input.separateMemberGuestScoring !== undefined)
+        updateData.separate_member_guest_scoring =
+          input.separateMemberGuestScoring;
+      if (input.resultCountWeight !== undefined)
+        updateData.result_count_weight = input.resultCountWeight;
+      if (input.resultCountLength !== undefined)
+        updateData.result_count_length = input.resultCountLength;
+      if (input.resultCountCount !== undefined)
+        updateData.result_count_count = input.resultCountCount;
+
+      const { data, error } = await client
+        .from('competitions')
+        .update(updateData)
+        .eq('id', input.competitionId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteCompetition(competitionId: string) {
+      const { error } = await client
+        .from('competitions')
+        .delete()
+        .eq('id', competitionId);
+      if (error) throw error;
+    },
+
+    async listParticipants(competitionId: string) {
+      const { data, error } = await client
+        .from('competition_participants')
+        .select(
+          'id, competition_id, member_id, category_id, participant_name, birth_date, address, phone, email, participated, total_catch_count, total_weight_g, total_length_cm, heaviest_catch_g, longest_catch_cm, created_at, competition_categories ( id, name )',
+        )
+        .eq('competition_id', competitionId)
+        .order('participant_name');
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async addParticipant(input: CreateCompetitionParticipantInput) {
+      const { data, error } = await client
+        .from('competition_participants')
+        .insert({
+          competition_id: input.competitionId,
+          member_id: input.memberId,
+          category_id: input.categoryId,
+          participant_name: input.participantName,
+          birth_date: input.birthDate,
+          address: input.address,
+          phone: input.phone,
+          email: input.email,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateParticipant(
+      participantId: string,
+      updates: {
+        participated?: boolean;
+        totalCatchCount?: number;
+        totalWeightG?: number;
+        totalLengthCm?: number;
+        heaviestCatchG?: number;
+        longestCatchCm?: number;
+      },
+    ) {
+      const updateData: Record<string, unknown> = {};
+
+      if (updates.participated !== undefined)
+        updateData.participated = updates.participated;
+      if (updates.totalCatchCount !== undefined)
+        updateData.total_catch_count = updates.totalCatchCount;
+      if (updates.totalWeightG !== undefined)
+        updateData.total_weight_g = updates.totalWeightG;
+      if (updates.totalLengthCm !== undefined)
+        updateData.total_length_cm = updates.totalLengthCm;
+      if (updates.heaviestCatchG !== undefined)
+        updateData.heaviest_catch_g = updates.heaviestCatchG;
+      if (updates.longestCatchCm !== undefined)
+        updateData.longest_catch_cm = updates.longestCatchCm;
+
+      const { data, error } = await client
+        .from('competition_participants')
+        .update(updateData)
+        .eq('id', participantId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async removeParticipant(participantId: string) {
+      const { error } = await client
+        .from('competition_participants')
+        .delete()
+        .eq('id', participantId);
+      if (error) throw error;
+    },
+
+    async computeCompetitionResults(competitionId: string) {
+      // Get all participants
+      const { data: participants, error: pError } = await client
+        .from('competition_participants')
+        .select('id, participant_name, member_id, category_id')
+        .eq('competition_id', competitionId);
+      if (pError) throw pError;
+
+      if (!participants || participants.length === 0) return [];
+
+      // Get all catches for this competition
+      const { data: catches, error: cError } = await client
+        .from('catches')
+        .select('id, competition_participant_id, quantity, weight_g, length_cm')
+        .eq('competition_id', competitionId)
+        .eq('is_empty_entry', false);
+      if (cError) throw cError;
+
+      const catchesList = catches ?? [];
+
+      // Aggregate per participant
+      const results = participants.map((p) => {
+        const pCatches = catchesList.filter(
+          (c) => c.competition_participant_id === p.id,
+        );
+        const totalCount = pCatches.reduce(
+          (sum, c) => sum + (c.quantity ?? 0),
+          0,
+        );
+        const totalWeightG = pCatches.reduce(
+          (sum, c) => sum + (c.weight_g ?? 0),
+          0,
+        );
+        const totalLengthCm = pCatches.reduce(
+          (sum, c) => sum + (c.length_cm ?? 0),
+          0,
+        );
+        const heaviestG = pCatches.reduce(
+          (max, c) => Math.max(max, c.weight_g ?? 0),
+          0,
+        );
+        const longestCm = pCatches.reduce(
+          (max, c) => Math.max(max, c.length_cm ?? 0),
+          0,
+        );
+
+        return {
+          participantId: p.id,
+          participantName: p.participant_name,
+          memberId: p.member_id,
+          categoryId: p.category_id,
+          totalCatchCount: totalCount,
+          totalWeightG,
+          totalLengthCm,
+          heaviestCatchG: heaviestG,
+          longestCatchCm: longestCm,
+        };
+      });
+
+      // Update each participant's results in DB
+      for (const r of results) {
+        await client
+          .from('competition_participants')
+          .update({
+            participated: true,
+            total_catch_count: r.totalCatchCount,
+            total_weight_g: r.totalWeightG,
+            total_length_cm: r.totalLengthCm,
+            heaviest_catch_g: r.heaviestCatchG,
+            longest_catch_cm: r.longestCatchCm,
+          })
+          .eq('id', r.participantId);
+      }
+
+      // Return ranked results (by total weight descending as default)
+      return results.sort((a, b) => b.totalWeightG - a.totalWeightG);
+    },
+
+    // =====================================================
+    // Suppliers
+    // =====================================================
+
+    async listSuppliers(accountId: string) {
+      const { data, error } = await client
+        .from('fish_suppliers')
+        .select(
+          'id, name, contact_person, phone, email, address, notes, is_active, created_at, updated_at',
+        )
+        .eq('account_id', accountId)
+        .eq('is_active', true)
+        .order('name');
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createSupplier(input: CreateSupplierInput) {
+      const { data, error } = await client
+        .from('fish_suppliers')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          contact_person: input.contactPerson,
+          phone: input.phone,
+          email: input.email,
+          address: input.address,
+          notes: input.notes,
+          is_active: input.isActive,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateSupplier(input: UpdateSupplierInput) {
+      const updateData: Record<string, unknown> = {};
+
+      if (input.name !== undefined) updateData.name = input.name;
+      if (input.contactPerson !== undefined)
+        updateData.contact_person = input.contactPerson;
+      if (input.phone !== undefined) updateData.phone = input.phone;
+      if (input.email !== undefined) updateData.email = input.email;
+      if (input.address !== undefined) updateData.address = input.address;
+      if (input.notes !== undefined) updateData.notes = input.notes;
+      if (input.isActive !== undefined)
+        updateData.is_active = input.isActive;
+
+      const { data, error } = await client
+        .from('fish_suppliers')
+        .update(updateData)
+        .eq('id', input.supplierId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteSupplier(supplierId: string) {
+      const { error } = await client
+        .from('fish_suppliers')
+        .delete()
+        .eq('id', supplierId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Dashboard
+    // =====================================================
+
+    async getDashboardStats(accountId: string) {
+      const currentYear = new Date().getFullYear();
+      const today = new Date().toISOString().split('T')[0]!;
+
+      const [
+        watersResult,
+        speciesResult,
+        leasesResult,
+        catchBooksResult,
+        competitionsResult,
+        stockingResult,
+      ] = await Promise.all([
+        // Waters count (non-archived)
+        client
+          .from('waters')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId)
+          .eq('is_archived', false),
+        // Species count (active)
+        client
+          .from('fish_species')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId)
+          .eq('is_active', true),
+        // Active leases count
+        client
+          .from('fishing_leases')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId)
+          .eq('is_archived', false)
+          .or(`end_date.is.null,end_date.gte.${today}`),
+        // Pending catch books (status = 'offen' or 'eingereicht')
+        client
+          .from('catch_books')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId)
+          .in('status', ['offen', 'eingereicht']),
+        // Upcoming competitions (date >= today)
+        client
+          .from('competitions')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId)
+          .gte('competition_date', today),
+        // Total stocking cost for current year
+        client
+          .from('fish_stocking')
+          .select('cost_euros')
+          .eq('account_id', accountId)
+          .gte('stocking_date', `${currentYear}-01-01`)
+          .lte('stocking_date', `${currentYear}-12-31`),
+      ]);
+
+      const stockingCostYtd = (stockingResult.data ?? []).reduce(
+        (sum, s) => sum + (Number(s.cost_euros) || 0),
+        0,
+      );
+
+      return {
+        watersCount: watersResult.count ?? 0,
+        speciesCount: speciesResult.count ?? 0,
+        activeLeasesCount: leasesResult.count ?? 0,
+        pendingCatchBooksCount: catchBooksResult.count ?? 0,
+        upcomingCompetitionsCount: competitionsResult.count ?? 0,
+        stockingCostYtd: Math.round(stockingCostYtd * 100) / 100,
+      };
+    },
+  };
+}
diff --git a/packages/features/fischerei/tsconfig.json b/packages/features/fischerei/tsconfig.json
new file mode 100644
index 000000000..090f168aa
--- /dev/null
+++ b/packages/features/fischerei/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "@kit/tsconfig/base.json",
+  "compilerOptions": { "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" },
+  "include": ["*.ts", "*.tsx", "src"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/features/member-management/src/components/application-workflow.tsx b/packages/features/member-management/src/components/application-workflow.tsx
index 35b5f7a4e..3ea8ea228 100644
--- a/packages/features/member-management/src/components/application-workflow.tsx
+++ b/packages/features/member-management/src/components/application-workflow.tsx
@@ -1,7 +1,6 @@
 'use client';
 
 import { useCallback } from 'react';
-import { useForm } from 'react-hook-form';
 import { useAction } from 'next-safe-action/hooks';
 import { useRouter } from 'next/navigation';
 import { toast } from '@kit/ui/sonner';
@@ -9,6 +8,10 @@ import { Badge } from '@kit/ui/badge';
 import { Button } from '@kit/ui/button';
 
 import { approveApplication, rejectApplication } from '../server/actions/member-actions';
+import {
+  APPLICATION_STATUS_VARIANT,
+  APPLICATION_STATUS_LABEL,
+} from '../lib/member-utils';
 
 interface ApplicationWorkflowProps {
   applications: Array<Record<string, unknown>>;
@@ -16,36 +19,12 @@ interface ApplicationWorkflowProps {
   account: string;
 }
 
-const APPLICATION_STATUS_LABELS: Record<string, string> = {
-  submitted: 'Eingereicht',
-  review: 'In Prüfung',
-  approved: 'Genehmigt',
-  rejected: 'Abgelehnt',
-};
-
-function getApplicationStatusColor(
-  status: string,
-): 'default' | 'secondary' | 'destructive' | 'outline' {
-  switch (status) {
-    case 'approved':
-      return 'default';
-    case 'submitted':
-    case 'review':
-      return 'outline';
-    case 'rejected':
-      return 'destructive';
-    default:
-      return 'secondary';
-  }
-}
-
 export function ApplicationWorkflow({
   applications,
   accountId,
   account,
 }: ApplicationWorkflowProps) {
   const router = useRouter();
-  const form = useForm();
 
   const { execute: executeApprove, isPending: isApproving } = useAction(
     approveApplication,
@@ -162,8 +141,8 @@ export function ApplicationWorkflow({
                         : '—'}
                     </td>
                     <td className="px-4 py-3">
-                      <Badge variant={getApplicationStatusColor(appStatus)}>
-                        {APPLICATION_STATUS_LABELS[appStatus] ?? appStatus}
+                      <Badge variant={APPLICATION_STATUS_VARIANT[appStatus] ?? 'secondary'}>
+                        {APPLICATION_STATUS_LABEL[appStatus] ?? appStatus}
                       </Badge>
                     </td>
                     <td className="px-4 py-3 text-right">
diff --git a/packages/features/member-management/src/lib/member-utils.ts b/packages/features/member-management/src/lib/member-utils.ts
index 094442a19..346f0da5e 100644
--- a/packages/features/member-management/src/lib/member-utils.ts
+++ b/packages/features/member-management/src/lib/member-utils.ts
@@ -67,3 +67,17 @@ export const STATUS_LABELS: Record<string, string> = {
   excluded: 'Ausgeschlossen',
   deceased: 'Verstorben',
 };
+
+export const APPLICATION_STATUS_VARIANT: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
+  submitted: 'outline',
+  review: 'secondary',
+  approved: 'default',
+  rejected: 'destructive',
+};
+
+export const APPLICATION_STATUS_LABEL: Record<string, string> = {
+  submitted: 'Eingereicht',
+  review: 'In Prüfung',
+  approved: 'Genehmigt',
+  rejected: 'Abgelehnt',
+};
diff --git a/packages/features/newsletter/src/components/create-newsletter-form.tsx b/packages/features/newsletter/src/components/create-newsletter-form.tsx
index 017529416..51f2d7c42 100644
--- a/packages/features/newsletter/src/components/create-newsletter-form.tsx
+++ b/packages/features/newsletter/src/components/create-newsletter-form.tsx
@@ -34,7 +34,7 @@ export function CreateNewsletterForm({ accountId, account }: Props) {
     onSuccess: ({ data }) => {
       if (data?.success) {
         toast.success('Newsletter erfolgreich erstellt');
-        router.push(`/home/${account}/newsletter-cms`);
+        router.push(`/home/${account}/newsletter`);
       }
     },
     onError: ({ error }) => {
diff --git a/packages/features/site-builder/package.json b/packages/features/site-builder/package.json
index 157236019..5a673fc01 100644
--- a/packages/features/site-builder/package.json
+++ b/packages/features/site-builder/package.json
@@ -13,6 +13,7 @@
     "./api": "./src/server/api.ts",
     "./schema/*": "./src/schema/*.ts",
     "./components": "./src/components/index.ts",
+    "./context": "./src/context/site-data-context.tsx",
     "./config/*": "./src/config/*.tsx",
     "./actions/*": "./src/server/actions/*.ts",
     "./hooks/*": "./src/hooks/*.ts"
diff --git a/packages/features/site-builder/src/components/site-renderer.tsx b/packages/features/site-builder/src/components/site-renderer.tsx
index e8818bd91..e8c00f242 100644
--- a/packages/features/site-builder/src/components/site-renderer.tsx
+++ b/packages/features/site-builder/src/components/site-renderer.tsx
@@ -2,11 +2,19 @@
 
 import { Render } from '@measured/puck';
 import { clubPuckConfig } from '../config/puck-config';
+import { SiteDataProvider, type SiteData } from '../context/site-data-context';
 
 interface Props {
   data: Record<string, unknown>;
+  siteData?: SiteData;
 }
 
-export function SiteRenderer({ data }: Props) {
-  return <Render config={clubPuckConfig} data={data as any} />;
+export function SiteRenderer({ data, siteData }: Props) {
+  const defaultData: SiteData = { accountId: '', events: [], courses: [], posts: [] };
+
+  return (
+    <SiteDataProvider data={siteData ?? defaultData}>
+      <Render config={clubPuckConfig} data={data as any} />
+    </SiteDataProvider>
+  );
 }
diff --git a/packages/features/site-builder/src/config/puck-config.tsx b/packages/features/site-builder/src/config/puck-config.tsx
index bf5d4ed60..1630724bc 100644
--- a/packages/features/site-builder/src/config/puck-config.tsx
+++ b/packages/features/site-builder/src/config/puck-config.tsx
@@ -1,5 +1,6 @@
 import type { Config } from '@measured/puck';
 import React from 'react';
+import { useSiteData } from '../context/site-data-context';
 
 // Block components inline for simplicity
 
@@ -165,80 +166,385 @@ const MemberLoginBlock = ({ title, description }: { title: string; description:
   </section>
 );
 
-const NewsFeedBlock = ({ count, showImage }: { count: number; showImage: boolean }) => (
-  <section className="py-12 px-6 max-w-4xl mx-auto">
-    <h2 className="text-2xl font-bold mb-6">Neuigkeiten</h2>
-    <div className="space-y-4">
-      {Array.from({ length: count || 3 }, (_, i) => (
-        <div key={i} className="rounded-lg border p-4 hover:bg-muted/30 transition-colors">
-          <div className="flex gap-4">
-            {showImage && <div className="h-20 w-20 shrink-0 rounded bg-muted" />}
-            <div>
-              <h3 className="font-semibold">Beitragstitel {i + 1}</h3>
-              <p className="text-sm text-muted-foreground mt-1">Kurzbeschreibung des Beitrags...</p>
-              <p className="text-xs text-muted-foreground mt-2">01.01.2026</p>
+const NewsFeedBlock = ({ count, showImage }: { count: number; showImage: boolean }) => {
+  const { posts } = useSiteData();
+  const items = posts.slice(0, count || 5);
+
+  if (items.length === 0) {
+    return (
+      <section className="py-12 px-6 max-w-4xl mx-auto">
+        <h2 className="text-2xl font-bold mb-6">Neuigkeiten</h2>
+        <p className="text-muted-foreground">Noch keine Beiträge vorhanden.</p>
+      </section>
+    );
+  }
+
+  return (
+    <section className="py-12 px-6 max-w-4xl mx-auto">
+      <h2 className="text-2xl font-bold mb-6">Neuigkeiten</h2>
+      <div className="space-y-4">
+        {items.map((post) => (
+          <div key={post.id} className="rounded-lg border p-4 hover:bg-muted/30 transition-colors">
+            <div className="flex gap-4">
+              {showImage && post.cover_image && <img src={post.cover_image} alt="" className="h-20 w-20 shrink-0 rounded object-cover" />}
+              {showImage && !post.cover_image && <div className="h-20 w-20 shrink-0 rounded bg-muted" />}
+              <div>
+                <h3 className="font-semibold">{post.title}</h3>
+                {post.excerpt && <p className="text-sm text-muted-foreground mt-1">{post.excerpt}</p>}
+                {post.published_at && <p className="text-xs text-muted-foreground mt-2">{new Date(post.published_at).toLocaleDateString('de-DE')}</p>}
+              </div>
             </div>
           </div>
-        </div>
-      ))}
-    </div>
-  </section>
-);
+        ))}
+      </div>
+    </section>
+  );
+};
 
-const EventListBlock = ({ count, showPastEvents }: { count: number; showPastEvents: boolean }) => (
-  <section className="py-12 px-6 max-w-4xl mx-auto">
-    <h2 className="text-2xl font-bold mb-6">Veranstaltungen</h2>
-    <div className="space-y-3">
-      {Array.from({ length: count || 3 }, (_, i) => (
-        <div key={i} className="flex items-center gap-4 rounded-lg border p-4">
-          <div className="flex h-14 w-14 shrink-0 flex-col items-center justify-center rounded-lg bg-primary/10 text-primary">
-            <span className="text-lg font-bold">{15 + i}</span>
-            <span className="text-xs">Apr</span>
-          </div>
-          <div>
-            <h3 className="font-semibold">Veranstaltung {i + 1}</h3>
-            <p className="text-xs text-muted-foreground">10:00 — Vereinsheim</p>
-          </div>
-        </div>
-      ))}
-    </div>
-  </section>
-);
+const EventListBlock = ({ count, showPastEvents }: { count: number; showPastEvents: boolean }) => {
+  const { events } = useSiteData();
+  const now = new Date().toISOString().slice(0, 10);
+  const filtered = showPastEvents ? events : events.filter(e => e.event_date >= now);
+  const items = filtered.slice(0, count || 5);
 
-const CourseCatalogBlock = ({ count, showPrice }: { count: number; showPrice: boolean }) => (
-  <section className="py-12 px-6 max-w-4xl mx-auto">
-    <h2 className="text-2xl font-bold mb-6">Kursangebot</h2>
-    <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
-      {Array.from({ length: count || 4 }, (_, i) => (
-        <div key={i} className="rounded-lg border p-4">
-          <h3 className="font-semibold">Kurs {i + 1}</h3>
-          <p className="text-sm text-muted-foreground mt-1">Mo, 18:00 — 20:00</p>
-          <div className="mt-3 flex items-center justify-between">
-            {showPrice && <span className="text-sm font-semibold text-primary">49,00 €</span>}
-            <span className="text-xs text-muted-foreground">5/15 Plätze</span>
-          </div>
-        </div>
-      ))}
-    </div>
-  </section>
-);
+  const [expandedId, setExpandedId] = React.useState<string | null>(null);
+  const [formData, setFormData] = React.useState({ firstName: '', lastName: '', email: '', phone: '', dateOfBirth: '' });
+  const [submitting, setSubmitting] = React.useState(false);
+  const [successId, setSuccessId] = React.useState<string | null>(null);
+  const [errorMsg, setErrorMsg] = React.useState('');
 
-const CardShopBlock = ({ title, description }: { title: string; description: string }) => (
-  <section className="py-12 px-6 max-w-4xl mx-auto">
-    <h2 className="text-2xl font-bold mb-2">{title || 'Mitgliedschaft'}</h2>
-    {description && <p className="text-muted-foreground mb-6">{description}</p>}
-    <div className="grid grid-cols-1 gap-4 sm:grid-cols-3">
-      {['Basis', 'Standard', 'Familie'].map((name, i) => (
-        <div key={name} className="rounded-lg border p-6 text-center hover:border-primary transition-colors">
-          <h3 className="text-lg font-bold">{name}</h3>
-          <p className="text-3xl font-bold text-primary mt-2">{[5, 10, 18][i]} €</p>
-          <p className="text-xs text-muted-foreground">pro Monat</p>
-          <button className="mt-4 w-full rounded-md bg-primary px-4 py-2 text-sm text-primary-foreground">Auswählen</button>
+  const handleSubmit = async (eventId: string) => {
+    if (!formData.firstName || !formData.lastName || !formData.email) {
+      setErrorMsg('Bitte füllen Sie alle Pflichtfelder aus.');
+      return;
+    }
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(formData.email)) {
+      setErrorMsg('Ungültige E-Mail-Adresse.');
+      return;
+    }
+    setSubmitting(true);
+    setErrorMsg('');
+    try {
+      const res = await fetch('/api/club/event-register', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          eventId,
+          firstName: formData.firstName,
+          lastName: formData.lastName,
+          email: formData.email,
+          phone: formData.phone || undefined,
+          dateOfBirth: formData.dateOfBirth || undefined,
+        }),
+      });
+      const result = await res.json();
+      if (result.success) {
+        setSuccessId(eventId);
+        setExpandedId(null);
+        setFormData({ firstName: '', lastName: '', email: '', phone: '', dateOfBirth: '' });
+      } else {
+        setErrorMsg(result.error || 'Anmeldung fehlgeschlagen.');
+      }
+    } catch {
+      setErrorMsg('Verbindungsfehler. Bitte versuchen Sie es erneut.');
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  if (items.length === 0) {
+    return (
+      <section className="py-12 px-6 max-w-4xl mx-auto">
+        <h2 className="text-2xl font-bold mb-6">Veranstaltungen</h2>
+        <p className="text-muted-foreground">Keine anstehenden Veranstaltungen.</p>
+      </section>
+    );
+  }
+
+  return (
+    <section className="py-12 px-6 max-w-4xl mx-auto">
+      <h2 className="text-2xl font-bold mb-6">Veranstaltungen</h2>
+      <div className="space-y-3">
+        {items.map((event) => {
+          const d = new Date(event.event_date);
+          const isExpanded = expandedId === event.id;
+          const isSuccess = successId === event.id;
+          return (
+            <div key={event.id} className="rounded-lg border overflow-hidden">
+              <div className="flex items-center gap-4 p-4">
+                <div className="flex h-14 w-14 shrink-0 flex-col items-center justify-center rounded-lg bg-primary/10 text-primary">
+                  <span className="text-lg font-bold">{d.getDate()}</span>
+                  <span className="text-xs">{d.toLocaleDateString('de-DE', { month: 'short' })}</span>
+                </div>
+                <div className="flex-1 min-w-0">
+                  <h3 className="font-semibold">{event.name}</h3>
+                  <p className="text-xs text-muted-foreground">
+                    {event.event_time ? event.event_time.slice(0, 5) : ''}{event.location ? ` — ${event.location}` : ''}
+                  </p>
+                </div>
+                {event.fee > 0 && <span className="text-sm font-semibold text-primary shrink-0">{event.fee.toFixed(2)} €</span>}
+                {isSuccess ? (
+                  <span className="shrink-0 flex items-center gap-1 text-sm font-semibold text-green-600">
+                    <svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" /></svg>
+                    Angemeldet
+                  </span>
+                ) : (
+                  <button
+                    onClick={() => { setExpandedId(isExpanded ? null : event.id); setErrorMsg(''); setSuccessId(null); }}
+                    className="shrink-0 rounded-md bg-primary px-4 py-2 text-sm font-semibold text-primary-foreground hover:bg-primary/90"
+                  >
+                    Anmelden
+                  </button>
+                )}
+              </div>
+              {isExpanded && (
+                <div className="border-t bg-muted/30 p-4">
+                  <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+                    <input placeholder="Vorname *" value={formData.firstName} onChange={e => setFormData(p => ({ ...p, firstName: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" required />
+                    <input placeholder="Nachname *" value={formData.lastName} onChange={e => setFormData(p => ({ ...p, lastName: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" required />
+                    <input placeholder="E-Mail *" type="email" value={formData.email} onChange={e => setFormData(p => ({ ...p, email: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" required />
+                    <input placeholder="Telefon" type="tel" value={formData.phone} onChange={e => setFormData(p => ({ ...p, phone: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" />
+                    <input placeholder="Geburtsdatum" type="date" value={formData.dateOfBirth} onChange={e => setFormData(p => ({ ...p, dateOfBirth: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" />
+                  </div>
+                  {errorMsg && <p className="mt-2 text-sm text-red-600">{errorMsg}</p>}
+                  <div className="mt-3 flex gap-2">
+                    <button
+                      onClick={() => handleSubmit(event.id)}
+                      disabled={submitting}
+                      className="rounded-md bg-primary px-6 py-2 text-sm font-semibold text-primary-foreground hover:bg-primary/90 disabled:opacity-50 flex items-center gap-2"
+                    >
+                      {submitting && <svg className="h-4 w-4 animate-spin" viewBox="0 0 24 24" fill="none"><circle cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" className="opacity-25" /><path d="M4 12a8 8 0 018-8" stroke="currentColor" strokeWidth="4" strokeLinecap="round" className="opacity-75" /></svg>}
+                      Anmeldung absenden
+                    </button>
+                    <button onClick={() => setExpandedId(null)} className="rounded-md border px-4 py-2 text-sm hover:bg-muted">Abbrechen</button>
+                  </div>
+                </div>
+              )}
+            </div>
+          );
+        })}
+      </div>
+    </section>
+  );
+};
+
+const CourseCatalogBlock = ({ count, showPrice }: { count: number; showPrice: boolean }) => {
+  const { courses } = useSiteData();
+  const items = courses.slice(0, count || 4);
+
+  const [expandedId, setExpandedId] = React.useState<string | null>(null);
+  const [formData, setFormData] = React.useState({ firstName: '', lastName: '', email: '', phone: '' });
+  const [submitting, setSubmitting] = React.useState(false);
+  const [successId, setSuccessId] = React.useState<string | null>(null);
+  const [errorMsg, setErrorMsg] = React.useState('');
+
+  const handleSubmit = async (courseId: string) => {
+    if (!formData.firstName || !formData.lastName || !formData.email) {
+      setErrorMsg('Bitte füllen Sie alle Pflichtfelder aus.');
+      return;
+    }
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(formData.email)) {
+      setErrorMsg('Ungültige E-Mail-Adresse.');
+      return;
+    }
+    setSubmitting(true);
+    setErrorMsg('');
+    try {
+      const res = await fetch('/api/club/course-register', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          courseId,
+          firstName: formData.firstName,
+          lastName: formData.lastName,
+          email: formData.email,
+          phone: formData.phone || undefined,
+        }),
+      });
+      const result = await res.json();
+      if (result.success) {
+        setSuccessId(courseId);
+        setExpandedId(null);
+        setFormData({ firstName: '', lastName: '', email: '', phone: '' });
+      } else {
+        setErrorMsg(result.error || 'Anmeldung fehlgeschlagen.');
+      }
+    } catch {
+      setErrorMsg('Verbindungsfehler. Bitte versuchen Sie es erneut.');
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  if (items.length === 0) {
+    return (
+      <section className="py-12 px-6 max-w-4xl mx-auto">
+        <h2 className="text-2xl font-bold mb-6">Kursangebot</h2>
+        <p className="text-muted-foreground">Aktuell keine Kurse verfügbar.</p>
+      </section>
+    );
+  }
+
+  return (
+    <section className="py-12 px-6 max-w-4xl mx-auto">
+      <h2 className="text-2xl font-bold mb-6">Kursangebot</h2>
+      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+        {items.map((course) => {
+          const isExpanded = expandedId === course.id;
+          const isSuccess = successId === course.id;
+          return (
+            <div key={course.id} className="rounded-lg border overflow-hidden">
+              <div className="p-4">
+                <h3 className="font-semibold">{course.name}</h3>
+                {course.start_date && (
+                  <p className="text-sm text-muted-foreground mt-1">Ab {new Date(course.start_date).toLocaleDateString('de-DE')}</p>
+                )}
+                <div className="mt-3 flex items-center justify-between">
+                  {showPrice && <span className="text-sm font-semibold text-primary">{course.fee.toFixed(2)} €</span>}
+                  {course.capacity && <span className="text-xs text-muted-foreground">{course.enrolled_count}/{course.capacity} Plätze</span>}
+                </div>
+                <div className="mt-3">
+                  {isSuccess ? (
+                    <span className="flex items-center gap-1 text-sm font-semibold text-green-600">
+                      <svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" /></svg>
+                      Anmeldung erfolgreich!
+                    </span>
+                  ) : (
+                    <button
+                      onClick={() => { setExpandedId(isExpanded ? null : course.id); setErrorMsg(''); setSuccessId(null); }}
+                      className="w-full rounded-md bg-primary px-4 py-2 text-sm font-semibold text-primary-foreground hover:bg-primary/90"
+                    >
+                      Anmelden
+                    </button>
+                  )}
+                </div>
+              </div>
+              {isExpanded && (
+                <div className="border-t bg-muted/30 p-4">
+                  <div className="space-y-3">
+                    <input placeholder="Vorname *" value={formData.firstName} onChange={e => setFormData(p => ({ ...p, firstName: e.target.value }))} className="w-full rounded-md border px-3 py-2 text-sm" required />
+                    <input placeholder="Nachname *" value={formData.lastName} onChange={e => setFormData(p => ({ ...p, lastName: e.target.value }))} className="w-full rounded-md border px-3 py-2 text-sm" required />
+                    <input placeholder="E-Mail *" type="email" value={formData.email} onChange={e => setFormData(p => ({ ...p, email: e.target.value }))} className="w-full rounded-md border px-3 py-2 text-sm" required />
+                    <input placeholder="Telefon" type="tel" value={formData.phone} onChange={e => setFormData(p => ({ ...p, phone: e.target.value }))} className="w-full rounded-md border px-3 py-2 text-sm" />
+                  </div>
+                  {errorMsg && <p className="mt-2 text-sm text-red-600">{errorMsg}</p>}
+                  <div className="mt-3 flex gap-2">
+                    <button
+                      onClick={() => handleSubmit(course.id)}
+                      disabled={submitting}
+                      className="flex-1 rounded-md bg-primary px-4 py-2 text-sm font-semibold text-primary-foreground hover:bg-primary/90 disabled:opacity-50 flex items-center justify-center gap-2"
+                    >
+                      {submitting && <svg className="h-4 w-4 animate-spin" viewBox="0 0 24 24" fill="none"><circle cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" className="opacity-25" /><path d="M4 12a8 8 0 018-8" stroke="currentColor" strokeWidth="4" strokeLinecap="round" className="opacity-75" /></svg>}
+                      Absenden
+                    </button>
+                    <button onClick={() => setExpandedId(null)} className="rounded-md border px-4 py-2 text-sm hover:bg-muted">Abbrechen</button>
+                  </div>
+                </div>
+              )}
+            </div>
+          );
+        })}
+      </div>
+    </section>
+  );
+};
+
+const CardShopBlock = ({ title, description }: { title: string; description: string }) => {
+  const { accountId } = useSiteData();
+  const [formData, setFormData] = React.useState({
+    firstName: '', lastName: '', email: '', phone: '',
+    street: '', postalCode: '', city: '', dateOfBirth: '', message: '',
+  });
+  const [submitting, setSubmitting] = React.useState(false);
+  const [success, setSuccess] = React.useState(false);
+  const [errorMsg, setErrorMsg] = React.useState('');
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!formData.firstName || !formData.lastName || !formData.email) {
+      setErrorMsg('Bitte füllen Sie alle Pflichtfelder aus.');
+      return;
+    }
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(formData.email)) {
+      setErrorMsg('Ungültige E-Mail-Adresse.');
+      return;
+    }
+    setSubmitting(true);
+    setErrorMsg('');
+    try {
+      const res = await fetch('/api/club/membership-apply', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          accountId,
+          firstName: formData.firstName,
+          lastName: formData.lastName,
+          email: formData.email,
+          phone: formData.phone || undefined,
+          street: formData.street || undefined,
+          postalCode: formData.postalCode || undefined,
+          city: formData.city || undefined,
+          dateOfBirth: formData.dateOfBirth || undefined,
+          message: formData.message || undefined,
+        }),
+      });
+      const result = await res.json();
+      if (result.success) {
+        setSuccess(true);
+        setFormData({ firstName: '', lastName: '', email: '', phone: '', street: '', postalCode: '', city: '', dateOfBirth: '', message: '' });
+      } else {
+        setErrorMsg(result.error || 'Bewerbung fehlgeschlagen.');
+      }
+    } catch {
+      setErrorMsg('Verbindungsfehler. Bitte versuchen Sie es erneut.');
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  if (success) {
+    return (
+      <section className="py-12 px-6 max-w-2xl mx-auto text-center">
+        <div className="rounded-lg border border-green-200 bg-green-50 p-8">
+          <svg className="mx-auto h-12 w-12 text-green-600" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" /></svg>
+          <h2 className="mt-4 text-2xl font-bold text-green-800">Bewerbung eingereicht!</h2>
+          <p className="mt-2 text-green-700">Ihre Bewerbung wurde eingereicht! Wir melden uns bei Ihnen.</p>
         </div>
-      ))}
-    </div>
-  </section>
-);
+      </section>
+    );
+  }
+
+  return (
+    <section className="py-12 px-6 max-w-2xl mx-auto">
+      <h2 className="text-2xl font-bold mb-2">{title || 'Mitglied werden'}</h2>
+      {description && <p className="text-muted-foreground mb-6">{description}</p>}
+      <form onSubmit={handleSubmit} className="space-y-4">
+        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+          <input placeholder="Vorname *" value={formData.firstName} onChange={e => setFormData(p => ({ ...p, firstName: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" required />
+          <input placeholder="Nachname *" value={formData.lastName} onChange={e => setFormData(p => ({ ...p, lastName: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" required />
+          <input placeholder="E-Mail *" type="email" value={formData.email} onChange={e => setFormData(p => ({ ...p, email: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" required />
+          <input placeholder="Telefon" type="tel" value={formData.phone} onChange={e => setFormData(p => ({ ...p, phone: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" />
+          <input placeholder="Straße" value={formData.street} onChange={e => setFormData(p => ({ ...p, street: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" />
+          <div className="grid grid-cols-2 gap-2">
+            <input placeholder="PLZ" value={formData.postalCode} onChange={e => setFormData(p => ({ ...p, postalCode: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" />
+            <input placeholder="Ort" value={formData.city} onChange={e => setFormData(p => ({ ...p, city: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" />
+          </div>
+          <input placeholder="Geburtsdatum" type="date" value={formData.dateOfBirth} onChange={e => setFormData(p => ({ ...p, dateOfBirth: e.target.value }))} className="rounded-md border px-3 py-2 text-sm" />
+        </div>
+        <textarea placeholder="Nachricht (optional)" rows={3} value={formData.message} onChange={e => setFormData(p => ({ ...p, message: e.target.value }))} className="w-full rounded-md border px-3 py-2 text-sm" />
+        {errorMsg && <p className="text-sm text-red-600">{errorMsg}</p>}
+        <button
+          type="submit"
+          disabled={submitting}
+          className="w-full rounded-md bg-primary px-6 py-3 text-sm font-semibold text-primary-foreground hover:bg-primary/90 disabled:opacity-50 flex items-center justify-center gap-2"
+        >
+          {submitting && <svg className="h-4 w-4 animate-spin" viewBox="0 0 24 24" fill="none"><circle cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" className="opacity-25" /><path d="M4 12a8 8 0 018-8" stroke="currentColor" strokeWidth="4" strokeLinecap="round" className="opacity-75" /></svg>}
+          Mitgliedschaft beantragen
+        </button>
+      </form>
+    </section>
+  );
+};
 
 const ColumnsBlock = ({ columns }: { columns: number }) => (
   <section className="py-8 px-6">
diff --git a/packages/features/site-builder/src/context/site-data-context.tsx b/packages/features/site-builder/src/context/site-data-context.tsx
new file mode 100644
index 000000000..ff4de57f6
--- /dev/null
+++ b/packages/features/site-builder/src/context/site-data-context.tsx
@@ -0,0 +1,57 @@
+'use client';
+
+import { createContext, useContext } from 'react';
+
+export interface SiteData {
+  accountId: string;
+  events: Array<{
+    id: string;
+    name: string;
+    event_date: string;
+    event_time?: string;
+    location?: string;
+    fee: number;
+    status: string;
+  }>;
+  courses: Array<{
+    id: string;
+    name: string;
+    start_date?: string;
+    end_date?: string;
+    fee: number;
+    capacity?: number;
+    enrolled_count: number;
+    status?: string;
+  }>;
+  posts: Array<{
+    id: string;
+    title: string;
+    excerpt?: string;
+    cover_image?: string;
+    published_at?: string;
+    slug: string;
+  }>;
+}
+
+const SiteDataContext = createContext<SiteData>({
+  accountId: '',
+  events: [],
+  courses: [],
+  posts: [],
+});
+
+export function SiteDataProvider({
+  data,
+  children,
+}: {
+  data: SiteData;
+  children: React.ReactNode;
+}) {
+  return (
+    <SiteDataContext.Provider value={data}>{children}</SiteDataContext.Provider>
+  );
+}
+
+export function useSiteData() {
+  return useContext(SiteDataContext);
+}
diff --git a/packages/features/sitzungsprotokolle/package.json b/packages/features/sitzungsprotokolle/package.json
new file mode 100644
index 000000000..deff847bc
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@kit/sitzungsprotokolle",
+  "version": "0.1.0",
+  "private": true,
+  "typesVersions": {
+    "*": {
+      "*": [
+        "src/*"
+      ]
+    }
+  },
+  "exports": {
+    "./api": "./src/server/api.ts",
+    "./schema/*": "./src/schema/*.ts",
+    "./components": "./src/components/index.ts",
+    "./actions/*": "./src/server/actions/*.ts",
+    "./lib/*": "./src/lib/*.ts"
+  },
+  "scripts": {
+    "clean": "git clean -xdf .turbo node_modules",
+    "typecheck": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "@hookform/resolvers": "catalog:",
+    "@kit/next": "workspace:*",
+    "@kit/shared": "workspace:*",
+    "@kit/supabase": "workspace:*",
+    "@kit/tsconfig": "workspace:*",
+    "@kit/ui": "workspace:*",
+    "@supabase/supabase-js": "catalog:",
+    "@types/react": "catalog:",
+    "lucide-react": "catalog:",
+    "next": "catalog:",
+    "next-safe-action": "catalog:",
+    "react": "catalog:",
+    "react-hook-form": "catalog:",
+    "zod": "catalog:"
+  }
+}
diff --git a/packages/features/sitzungsprotokolle/src/components/create-protocol-form.tsx b/packages/features/sitzungsprotokolle/src/components/create-protocol-form.tsx
new file mode 100644
index 000000000..630a51dad
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/components/create-protocol-form.tsx
@@ -0,0 +1,228 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { useAction } from 'next-safe-action/hooks';
+import { useRouter } from 'next/navigation';
+
+import { Button } from '@kit/ui/button';
+import { Input } from '@kit/ui/input';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  FormDescription,
+} from '@kit/ui/form';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+import { Switch } from '@kit/ui/switch';
+
+import { CreateMeetingProtocolSchema } from '../schema/meetings.schema';
+import { createProtocol } from '../server/actions/meetings-actions';
+
+interface CreateProtocolFormProps {
+  accountId: string;
+  account: string;
+}
+
+export function CreateProtocolForm({
+  accountId,
+  account,
+}: CreateProtocolFormProps) {
+  const router = useRouter();
+
+  const form = useForm({
+    resolver: zodResolver(CreateMeetingProtocolSchema),
+    defaultValues: {
+      accountId,
+      title: '',
+      meetingDate: new Date().toISOString().split('T')[0]!,
+      meetingType: 'vorstand' as const,
+      location: '',
+      attendees: '',
+      remarks: '',
+      isPublished: false,
+    },
+  });
+
+  const { execute, isPending } = useAction(createProtocol, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success('Protokoll erfolgreich erstellt');
+        router.push(`/home/${account}/meetings/protocols`);
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Speichern des Protokolls');
+    },
+  });
+
+  return (
+    <Form {...form}>
+      <form
+        onSubmit={form.handleSubmit((data) => execute(data))}
+        className="space-y-6"
+      >
+        {/* Card 1: Grunddaten */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Sitzungsdaten</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <div className="sm:col-span-2">
+              <FormField
+                control={form.control}
+                name="title"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Titel *</FormLabel>
+                    <FormControl>
+                      <Input placeholder="z.B. Vorstandssitzung März 2026" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+
+            <FormField
+              control={form.control}
+              name="meetingDate"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Sitzungsdatum *</FormLabel>
+                  <FormControl>
+                    <Input type="date" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="meetingType"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Sitzungsart *</FormLabel>
+                  <FormControl>
+                    <select
+                      {...field}
+                      className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                    >
+                      <option value="vorstand">Vorstandssitzung</option>
+                      <option value="mitglieder">Mitgliederversammlung</option>
+                      <option value="ausschuss">Ausschusssitzung</option>
+                      <option value="sonstige">Sonstige</option>
+                    </select>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="location"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Ort</FormLabel>
+                  <FormControl>
+                    <Input placeholder="z.B. Vereinsheim" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Card 2: Teilnehmer & Anmerkungen */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Teilnehmer & Anmerkungen</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4">
+            <FormField
+              control={form.control}
+              name="attendees"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Teilnehmer</FormLabel>
+                  <FormControl>
+                    <textarea
+                      {...field}
+                      placeholder="Namen der Teilnehmer (kommagetrennt oder zeilenweise)"
+                      className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="remarks"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Anmerkungen</FormLabel>
+                  <FormControl>
+                    <textarea
+                      {...field}
+                      placeholder="Optionale Anmerkungen zum Protokoll"
+                      className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Card 3: Veröffentlichung */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Veröffentlichung</CardTitle>
+          </CardHeader>
+          <CardContent>
+            <FormField
+              control={form.control}
+              name="isPublished"
+              render={({ field }) => (
+                <FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
+                  <div className="space-y-0.5">
+                    <FormLabel className="text-base">Protokoll veröffentlichen</FormLabel>
+                    <FormDescription>
+                      Veröffentlichte Protokolle sind für alle Mitglieder sichtbar.
+                    </FormDescription>
+                  </div>
+                  <FormControl>
+                    <Switch
+                      checked={field.value}
+                      onCheckedChange={field.onChange}
+                    />
+                  </FormControl>
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Submit */}
+        <div className="flex justify-end gap-2">
+          <Button type="button" variant="outline" onClick={() => router.back()}>
+            Abbrechen
+          </Button>
+          <Button type="submit" disabled={isPending}>
+            {isPending ? 'Wird gespeichert...' : 'Protokoll erstellen'}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+}
diff --git a/packages/features/sitzungsprotokolle/src/components/index.ts b/packages/features/sitzungsprotokolle/src/components/index.ts
new file mode 100644
index 000000000..67389c832
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/components/index.ts
@@ -0,0 +1,6 @@
+export { MeetingsTabNavigation } from './meetings-tab-navigation';
+export { MeetingsDashboard } from './meetings-dashboard';
+export { ProtocolsDataTable } from './protocols-data-table';
+export { CreateProtocolForm } from './create-protocol-form';
+export { ProtocolItemsList } from './protocol-items-list';
+export { OpenTasksView } from './open-tasks-view';
diff --git a/packages/features/sitzungsprotokolle/src/components/meetings-dashboard.tsx b/packages/features/sitzungsprotokolle/src/components/meetings-dashboard.tsx
new file mode 100644
index 000000000..886bd27ba
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/components/meetings-dashboard.tsx
@@ -0,0 +1,210 @@
+'use client';
+
+import Link from 'next/link';
+
+import {
+  FileText,
+  Calendar,
+  ListChecks,
+  AlertTriangle,
+} from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+import { MEETING_TYPE_LABELS } from '../lib/meetings-constants';
+
+interface DashboardStats {
+  totalProtocols: number;
+  thisYearProtocols: number;
+  openTasks: number;
+  overdueTasks: number;
+}
+
+interface RecentProtocol {
+  id: string;
+  title: string;
+  meeting_date: string;
+  meeting_type: string;
+  is_published: boolean;
+}
+
+interface OverdueTask {
+  id: string;
+  title: string;
+  responsible_person: string | null;
+  due_date: string | null;
+  status: string;
+  meeting_protocols: {
+    id: string;
+    title: string;
+  };
+}
+
+interface MeetingsDashboardProps {
+  stats: DashboardStats;
+  recentProtocols: RecentProtocol[];
+  overdueTasks: OverdueTask[];
+  account: string;
+}
+
+export function MeetingsDashboard({
+  stats,
+  recentProtocols,
+  overdueTasks,
+  account,
+}: MeetingsDashboardProps) {
+  return (
+    <div className="flex w-full flex-col gap-6">
+      {/* Header */}
+      <div>
+        <h1 className="text-2xl font-bold">Sitzungsprotokolle – Übersicht</h1>
+        <p className="text-muted-foreground">
+          Protokolle, Tagesordnungspunkte und Aufgaben verwalten
+        </p>
+      </div>
+
+      {/* Stats Grid */}
+      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
+        <Link href={`/home/${account}/meetings/protocols`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Protokolle gesamt</p>
+                  <p className="text-2xl font-bold">{stats.totalProtocols}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <FileText className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Link href={`/home/${account}/meetings/protocols`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Protokolle dieses Jahr</p>
+                  <p className="text-2xl font-bold">{stats.thisYearProtocols}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <Calendar className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Link href={`/home/${account}/meetings/tasks`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Offene Aufgaben</p>
+                  <p className="text-2xl font-bold">{stats.openTasks}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <ListChecks className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Link href={`/home/${account}/meetings/tasks`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Überfällige Aufgaben</p>
+                  <p className="text-2xl font-bold">{stats.overdueTasks}</p>
+                </div>
+                <div className="rounded-full bg-destructive/10 p-3 text-destructive">
+                  <AlertTriangle className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+      </div>
+
+      {/* Recent + Overdue Sections */}
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-base">Letzte Protokolle</CardTitle>
+          </CardHeader>
+          <CardContent>
+            {recentProtocols.length === 0 ? (
+              <p className="text-sm text-muted-foreground">
+                Noch keine Protokolle vorhanden.
+              </p>
+            ) : (
+              <div className="space-y-3">
+                {recentProtocols.map((protocol) => (
+                  <Link
+                    key={protocol.id}
+                    href={`/home/${account}/meetings/protocols/${protocol.id}`}
+                    className="flex items-center justify-between rounded-lg border p-3 transition-colors hover:bg-muted/50"
+                  >
+                    <div className="min-w-0 flex-1">
+                      <p className="truncate text-sm font-medium">{protocol.title}</p>
+                      <p className="text-xs text-muted-foreground">
+                        {new Date(protocol.meeting_date).toLocaleDateString('de-DE')}
+                        {' · '}
+                        {MEETING_TYPE_LABELS[protocol.meeting_type] ?? protocol.meeting_type}
+                      </p>
+                    </div>
+                    {protocol.is_published && (
+                      <Badge variant="default" className="ml-2 shrink-0">Veröffentlicht</Badge>
+                    )}
+                  </Link>
+                ))}
+              </div>
+            )}
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-base">Überfällige Aufgaben</CardTitle>
+          </CardHeader>
+          <CardContent>
+            {overdueTasks.length === 0 ? (
+              <p className="text-sm text-muted-foreground">
+                Keine überfälligen Aufgaben.
+              </p>
+            ) : (
+              <div className="space-y-3">
+                {overdueTasks.map((task) => (
+                  <div
+                    key={task.id}
+                    className="rounded-lg border border-destructive/20 bg-destructive/5 p-3"
+                  >
+                    <p className="text-sm font-medium">{task.title}</p>
+                    <div className="mt-1 flex items-center gap-2 text-xs text-muted-foreground">
+                      {task.responsible_person && (
+                        <span>Zuständig: {task.responsible_person}</span>
+                      )}
+                      {task.due_date && (
+                        <span>
+                          Fällig: {new Date(task.due_date).toLocaleDateString('de-DE')}
+                        </span>
+                      )}
+                    </div>
+                    <p className="mt-1 text-xs text-muted-foreground">
+                      Protokoll: {task.meeting_protocols.title}
+                    </p>
+                  </div>
+                ))}
+              </div>
+            )}
+          </CardContent>
+        </Card>
+      </div>
+    </div>
+  );
+}
diff --git a/packages/features/sitzungsprotokolle/src/components/meetings-tab-navigation.tsx b/packages/features/sitzungsprotokolle/src/components/meetings-tab-navigation.tsx
new file mode 100644
index 000000000..45b806246
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/components/meetings-tab-navigation.tsx
@@ -0,0 +1,47 @@
+'use client';
+
+import Link from 'next/link';
+import { cn } from '@kit/ui/utils';
+
+interface MeetingsTabNavigationProps {
+  account: string;
+  activeTab: string;
+}
+
+const TABS = [
+  { id: 'overview', label: 'Übersicht', path: '' },
+  { id: 'protocols', label: 'Protokolle', path: '/protocols' },
+  { id: 'tasks', label: 'Offene Aufgaben', path: '/tasks' },
+] as const;
+
+export function MeetingsTabNavigation({
+  account,
+  activeTab,
+}: MeetingsTabNavigationProps) {
+  const basePath = `/home/${account}/meetings`;
+
+  return (
+    <div className="mb-6 border-b">
+      <nav className="-mb-px flex space-x-1 overflow-x-auto" aria-label="Sitzungsprotokolle Navigation">
+        {TABS.map((tab) => {
+          const isActive = tab.id === activeTab;
+
+          return (
+            <Link
+              key={tab.id}
+              href={`${basePath}${tab.path}`}
+              className={cn(
+                'whitespace-nowrap border-b-2 px-4 py-2.5 text-sm font-medium transition-colors',
+                isActive
+                  ? 'border-primary text-primary'
+                  : 'border-transparent text-muted-foreground hover:border-muted-foreground/30 hover:text-foreground',
+              )}
+            >
+              {tab.label}
+            </Link>
+          );
+        })}
+      </nav>
+    </div>
+  );
+}
diff --git a/packages/features/sitzungsprotokolle/src/components/open-tasks-view.tsx b/packages/features/sitzungsprotokolle/src/components/open-tasks-view.tsx
new file mode 100644
index 000000000..e0f625085
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/components/open-tasks-view.tsx
@@ -0,0 +1,189 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useRouter, useSearchParams } from 'next/navigation';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+import { ITEM_STATUS_LABELS, ITEM_STATUS_COLORS } from '../lib/meetings-constants';
+
+interface OpenTask {
+  id: string;
+  title: string;
+  description: string | null;
+  responsible_person: string | null;
+  due_date: string | null;
+  status: string;
+  meeting_protocols: {
+    id: string;
+    title: string;
+    meeting_date: string;
+    meeting_type: string;
+  };
+}
+
+interface OpenTasksViewProps {
+  data: OpenTask[];
+  total: number;
+  page: number;
+  pageSize: number;
+  account: string;
+}
+
+export function OpenTasksView({
+  data,
+  total,
+  page,
+  pageSize,
+  account,
+}: OpenTasksViewProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+
+  const updateParams = useCallback(
+    (updates: Record<string, string>) => {
+      const params = new URLSearchParams(searchParams.toString());
+      for (const [key, value] of Object.entries(updates)) {
+        if (value) {
+          params.set(key, value);
+        } else {
+          params.delete(key);
+        }
+      }
+      router.push(`?${params.toString()}`);
+    },
+    [router, searchParams],
+  );
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      updateParams({ page: String(newPage) });
+    },
+    [updateParams],
+  );
+
+  const today = new Date();
+
+  return (
+    <div className="space-y-4">
+      <Card>
+        <CardHeader>
+          <CardTitle>Offene Aufgaben ({total})</CardTitle>
+        </CardHeader>
+        <CardContent>
+          {data.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Keine offenen Aufgaben</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Alle Tagesordnungspunkte sind erledigt oder vertagt.
+              </p>
+            </div>
+          ) : (
+            <div className="rounded-md border">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b bg-muted/50">
+                    <th className="p-3 text-left font-medium">Aufgabe</th>
+                    <th className="p-3 text-left font-medium">Protokoll</th>
+                    <th className="p-3 text-left font-medium">Zuständig</th>
+                    <th className="p-3 text-left font-medium">Fällig</th>
+                    <th className="p-3 text-center font-medium">Status</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((task) => {
+                    const isOverdue =
+                      task.due_date && new Date(task.due_date) < today;
+
+                    return (
+                      <tr
+                        key={task.id}
+                        className="cursor-pointer border-b hover:bg-muted/30"
+                        onClick={() =>
+                          router.push(
+                            `/home/${account}/meetings/protocols/${task.meeting_protocols.id}`,
+                          )
+                        }
+                      >
+                        <td className="p-3">
+                          <div>
+                            <p className="font-medium">{task.title}</p>
+                            {task.description && (
+                              <p className="mt-0.5 text-xs text-muted-foreground line-clamp-1">
+                                {task.description}
+                              </p>
+                            )}
+                          </div>
+                        </td>
+                        <td className="p-3 text-muted-foreground">
+                          <div>
+                            <p className="text-sm">{task.meeting_protocols.title}</p>
+                            <p className="text-xs">
+                              {new Date(task.meeting_protocols.meeting_date).toLocaleDateString('de-DE')}
+                            </p>
+                          </div>
+                        </td>
+                        <td className="p-3 text-muted-foreground">
+                          {task.responsible_person ?? '—'}
+                        </td>
+                        <td className={`p-3 ${isOverdue ? 'font-medium text-destructive' : 'text-muted-foreground'}`}>
+                          {task.due_date
+                            ? new Date(task.due_date).toLocaleDateString('de-DE')
+                            : '—'}
+                          {isOverdue && (
+                            <span className="ml-1 text-xs">(überfällig)</span>
+                          )}
+                        </td>
+                        <td className="p-3 text-center">
+                          <Badge
+                            variant={
+                              (ITEM_STATUS_COLORS[task.status] as 'default' | 'secondary' | 'destructive' | 'outline') ??
+                              'outline'
+                            }
+                          >
+                            {ITEM_STATUS_LABELS[task.status] ?? task.status}
+                          </Badge>
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {/* Pagination */}
+          {totalPages > 1 && (
+            <div className="mt-4 flex items-center justify-between">
+              <p className="text-sm text-muted-foreground">
+                Seite {page} von {totalPages} ({total} Einträge)
+              </p>
+              <div className="flex gap-2">
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page <= 1}
+                  onClick={() => handlePageChange(page - 1)}
+                >
+                  Zurück
+                </Button>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page >= totalPages}
+                  onClick={() => handlePageChange(page + 1)}
+                >
+                  Weiter
+                </Button>
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/sitzungsprotokolle/src/components/protocol-items-list.tsx b/packages/features/sitzungsprotokolle/src/components/protocol-items-list.tsx
new file mode 100644
index 000000000..30cb83ee6
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/components/protocol-items-list.tsx
@@ -0,0 +1,163 @@
+'use client';
+
+import { useAction } from 'next-safe-action/hooks';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+
+import { ITEM_STATUS_LABELS, ITEM_STATUS_COLORS } from '../lib/meetings-constants';
+import { updateItemStatus, deleteProtocolItem } from '../server/actions/meetings-actions';
+
+import type { MeetingItemStatus } from '../schema/meetings.schema';
+
+interface ProtocolItem {
+  id: string;
+  title: string;
+  description: string | null;
+  responsible_person: string | null;
+  due_date: string | null;
+  status: string;
+  sort_order: number;
+}
+
+interface ProtocolItemsListProps {
+  items: ProtocolItem[];
+  protocolId: string;
+  account: string;
+}
+
+const STATUS_TRANSITIONS: Record<string, MeetingItemStatus> = {
+  offen: 'in_bearbeitung',
+  in_bearbeitung: 'erledigt',
+  erledigt: 'offen',
+  vertagt: 'offen',
+};
+
+export function ProtocolItemsList({
+  items,
+  protocolId,
+  account,
+}: ProtocolItemsListProps) {
+  const { execute: executeStatusUpdate, isPending: isUpdating } = useAction(updateItemStatus, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success('Status aktualisiert');
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Aktualisieren');
+    },
+  });
+
+  const { execute: executeDelete, isPending: isDeleting } = useAction(deleteProtocolItem, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success('Tagesordnungspunkt gelöscht');
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Löschen');
+    },
+  });
+
+  const handleToggleStatus = (item: ProtocolItem) => {
+    const nextStatus = STATUS_TRANSITIONS[item.status] ?? 'offen';
+    executeStatusUpdate({ itemId: item.id, status: nextStatus });
+  };
+
+  const handleDelete = (itemId: string) => {
+    if (confirm('Tagesordnungspunkt wirklich löschen?')) {
+      executeDelete({ itemId });
+    }
+  };
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>Tagesordnungspunkte ({items.length})</CardTitle>
+      </CardHeader>
+      <CardContent>
+        {items.length === 0 ? (
+          <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-8 text-center">
+            <h3 className="text-lg font-semibold">Keine Tagesordnungspunkte</h3>
+            <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+              Fügen Sie Tagesordnungspunkte zu diesem Protokoll hinzu.
+            </p>
+          </div>
+        ) : (
+          <div className="rounded-md border">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="border-b bg-muted/50">
+                  <th className="p-3 text-left font-medium">#</th>
+                  <th className="p-3 text-left font-medium">Titel</th>
+                  <th className="p-3 text-left font-medium">Zuständig</th>
+                  <th className="p-3 text-left font-medium">Fällig</th>
+                  <th className="p-3 text-center font-medium">Status</th>
+                  <th className="p-3 text-right font-medium">Aktionen</th>
+                </tr>
+              </thead>
+              <tbody>
+                {items.map((item, index) => {
+                  const isOverdue =
+                    item.due_date &&
+                    ['offen', 'in_bearbeitung'].includes(item.status) &&
+                    new Date(item.due_date) < new Date();
+
+                  return (
+                    <tr key={item.id} className="border-b hover:bg-muted/30">
+                      <td className="p-3 text-muted-foreground">{index + 1}</td>
+                      <td className="p-3">
+                        <div>
+                          <p className="font-medium">{item.title}</p>
+                          {item.description && (
+                            <p className="mt-0.5 text-xs text-muted-foreground line-clamp-1">
+                              {item.description}
+                            </p>
+                          )}
+                        </div>
+                      </td>
+                      <td className="p-3 text-muted-foreground">
+                        {item.responsible_person ?? '—'}
+                      </td>
+                      <td className={`p-3 ${isOverdue ? 'font-medium text-destructive' : 'text-muted-foreground'}`}>
+                        {item.due_date
+                          ? new Date(item.due_date).toLocaleDateString('de-DE')
+                          : '—'}
+                      </td>
+                      <td className="p-3 text-center">
+                        <Badge
+                          variant={
+                            (ITEM_STATUS_COLORS[item.status] as 'default' | 'secondary' | 'destructive' | 'outline') ??
+                            'outline'
+                          }
+                          className="cursor-pointer"
+                          onClick={() => handleToggleStatus(item)}
+                        >
+                          {ITEM_STATUS_LABELS[item.status] ?? item.status}
+                        </Badge>
+                      </td>
+                      <td className="p-3 text-right">
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          className="text-destructive hover:text-destructive"
+                          disabled={isDeleting}
+                          onClick={() => handleDelete(item.id)}
+                        >
+                          Löschen
+                        </Button>
+                      </td>
+                    </tr>
+                  );
+                })}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/packages/features/sitzungsprotokolle/src/components/protocols-data-table.tsx b/packages/features/sitzungsprotokolle/src/components/protocols-data-table.tsx
new file mode 100644
index 000000000..5a7614b63
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/components/protocols-data-table.tsx
@@ -0,0 +1,233 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useForm } from 'react-hook-form';
+import { useRouter, useSearchParams } from 'next/navigation';
+import Link from 'next/link';
+
+import { Plus } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { Input } from '@kit/ui/input';
+
+import { MEETING_TYPE_LABELS } from '../lib/meetings-constants';
+
+interface ProtocolsDataTableProps {
+  data: Array<Record<string, unknown>>;
+  total: number;
+  page: number;
+  pageSize: number;
+  account: string;
+}
+
+const MEETING_TYPE_OPTIONS = [
+  { value: '', label: 'Alle Sitzungsarten' },
+  { value: 'vorstand', label: 'Vorstandssitzung' },
+  { value: 'mitglieder', label: 'Mitgliederversammlung' },
+  { value: 'ausschuss', label: 'Ausschusssitzung' },
+  { value: 'sonstige', label: 'Sonstige' },
+] as const;
+
+export function ProtocolsDataTable({
+  data,
+  total,
+  page,
+  pageSize,
+  account,
+}: ProtocolsDataTableProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const currentSearch = searchParams.get('q') ?? '';
+  const currentType = searchParams.get('type') ?? '';
+  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+
+  const form = useForm({
+    defaultValues: { search: currentSearch },
+  });
+
+  const updateParams = useCallback(
+    (updates: Record<string, string>) => {
+      const params = new URLSearchParams(searchParams.toString());
+      for (const [key, value] of Object.entries(updates)) {
+        if (value) {
+          params.set(key, value);
+        } else {
+          params.delete(key);
+        }
+      }
+      if (!('page' in updates)) {
+        params.delete('page');
+      }
+      router.push(`?${params.toString()}`);
+    },
+    [router, searchParams],
+  );
+
+  const handleSearch = useCallback(
+    (e: React.FormEvent) => {
+      e.preventDefault();
+      updateParams({ q: form.getValues('search') });
+    },
+    [form, updateParams],
+  );
+
+  const handleTypeChange = useCallback(
+    (e: React.ChangeEvent<HTMLSelectElement>) => {
+      updateParams({ type: e.target.value });
+    },
+    [updateParams],
+  );
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      updateParams({ page: String(newPage) });
+    },
+    [updateParams],
+  );
+
+  return (
+    <div className="space-y-4">
+      {/* Toolbar */}
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <form onSubmit={handleSearch} className="flex gap-2">
+          <Input
+            placeholder="Protokoll suchen..."
+            className="w-64"
+            {...form.register('search')}
+          />
+          <Button type="submit" variant="outline" size="sm">
+            Suchen
+          </Button>
+        </form>
+
+        <div className="flex items-center gap-3">
+          <select
+            value={currentType}
+            onChange={handleTypeChange}
+            className="flex h-9 rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm"
+          >
+            {MEETING_TYPE_OPTIONS.map((opt) => (
+              <option key={opt.value} value={opt.value}>
+                {opt.label}
+              </option>
+            ))}
+          </select>
+
+          <Link href={`/home/${account}/meetings/protocols/new`}>
+            <Button size="sm">
+              <Plus className="mr-2 h-4 w-4" />
+              Neues Protokoll
+            </Button>
+          </Link>
+        </div>
+      </div>
+
+      {/* Table */}
+      <Card>
+        <CardHeader>
+          <CardTitle>Protokolle ({total})</CardTitle>
+        </CardHeader>
+        <CardContent>
+          {data.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Keine Protokolle vorhanden</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Erstellen Sie Ihr erstes Sitzungsprotokoll, um loszulegen.
+              </p>
+              <Link href={`/home/${account}/meetings/protocols/new`} className="mt-4">
+                <Button>Neues Protokoll</Button>
+              </Link>
+            </div>
+          ) : (
+            <div className="rounded-md border">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b bg-muted/50">
+                    <th className="p-3 text-left font-medium">Datum</th>
+                    <th className="p-3 text-left font-medium">Titel</th>
+                    <th className="p-3 text-left font-medium">Sitzungsart</th>
+                    <th className="p-3 text-left font-medium">Ort</th>
+                    <th className="p-3 text-center font-medium">Status</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((protocol) => (
+                    <tr
+                      key={String(protocol.id)}
+                      className="cursor-pointer border-b hover:bg-muted/30"
+                      onClick={() =>
+                        router.push(
+                          `/home/${account}/meetings/protocols/${String(protocol.id)}`,
+                        )
+                      }
+                    >
+                      <td className="p-3 text-muted-foreground">
+                        {protocol.meeting_date
+                          ? new Date(String(protocol.meeting_date)).toLocaleDateString('de-DE')
+                          : '—'}
+                      </td>
+                      <td className="p-3 font-medium">
+                        <Link
+                          href={`/home/${account}/meetings/protocols/${String(protocol.id)}`}
+                          className="hover:underline"
+                        >
+                          {String(protocol.title)}
+                        </Link>
+                      </td>
+                      <td className="p-3">
+                        <Badge variant="secondary">
+                          {MEETING_TYPE_LABELS[String(protocol.meeting_type)] ??
+                            String(protocol.meeting_type)}
+                        </Badge>
+                      </td>
+                      <td className="p-3 text-muted-foreground">
+                        {String(protocol.location ?? '—')}
+                      </td>
+                      <td className="p-3 text-center">
+                        {protocol.is_published ? (
+                          <Badge variant="default">Veröffentlicht</Badge>
+                        ) : (
+                          <Badge variant="outline">Entwurf</Badge>
+                        )}
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {/* Pagination */}
+          {totalPages > 1 && (
+            <div className="mt-4 flex items-center justify-between">
+              <p className="text-sm text-muted-foreground">
+                Seite {page} von {totalPages} ({total} Einträge)
+              </p>
+              <div className="flex gap-2">
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page <= 1}
+                  onClick={() => handlePageChange(page - 1)}
+                >
+                  Zurück
+                </Button>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page >= totalPages}
+                  onClick={() => handlePageChange(page + 1)}
+                >
+                  Weiter
+                </Button>
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/sitzungsprotokolle/src/lib/meetings-constants.ts b/packages/features/sitzungsprotokolle/src/lib/meetings-constants.ts
new file mode 100644
index 000000000..4f95d417c
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/lib/meetings-constants.ts
@@ -0,0 +1,36 @@
+/**
+ * German label mappings for Sitzungsprotokolle enums and status colors.
+ */
+
+// =====================================================
+// Meeting Type Labels
+// =====================================================
+
+export const MEETING_TYPE_LABELS: Record<string, string> = {
+  vorstand: 'Vorstandssitzung',
+  mitglieder: 'Mitgliederversammlung',
+  ausschuss: 'Ausschusssitzung',
+  sonstige: 'Sonstige',
+};
+
+// =====================================================
+// Item Status Labels
+// =====================================================
+
+export const ITEM_STATUS_LABELS: Record<string, string> = {
+  offen: 'Offen',
+  in_bearbeitung: 'In Bearbeitung',
+  erledigt: 'Erledigt',
+  vertagt: 'Vertagt',
+};
+
+// =====================================================
+// Item Status Colors (Badge variants)
+// =====================================================
+
+export const ITEM_STATUS_COLORS: Record<string, string> = {
+  offen: 'outline',
+  in_bearbeitung: 'secondary',
+  erledigt: 'default',
+  vertagt: 'destructive',
+};
diff --git a/packages/features/sitzungsprotokolle/src/schema/meetings.schema.ts b/packages/features/sitzungsprotokolle/src/schema/meetings.schema.ts
new file mode 100644
index 000000000..3ad391b43
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/schema/meetings.schema.ts
@@ -0,0 +1,95 @@
+import { z } from 'zod';
+
+// =====================================================
+// Enums
+// =====================================================
+
+export const meetingItemStatusEnum = z.enum([
+  'offen',
+  'in_bearbeitung',
+  'erledigt',
+  'vertagt',
+]);
+
+export type MeetingItemStatus = z.infer<typeof meetingItemStatusEnum>;
+
+export const meetingTypeEnum = z.enum([
+  'vorstand',
+  'mitglieder',
+  'ausschuss',
+  'sonstige',
+]);
+
+export type MeetingType = z.infer<typeof meetingTypeEnum>;
+
+// =====================================================
+// Protocol Schemas
+// =====================================================
+
+export const CreateMeetingProtocolSchema = z.object({
+  accountId: z.string().uuid(),
+  title: z.string().min(1, 'Titel ist erforderlich'),
+  meetingDate: z.string().min(1, 'Datum ist erforderlich'),
+  meetingType: meetingTypeEnum,
+  location: z.string().optional(),
+  attendees: z.string().optional(),
+  remarks: z.string().optional(),
+  isPublished: z.boolean().default(false),
+});
+
+export type CreateMeetingProtocolInput = z.infer<typeof CreateMeetingProtocolSchema>;
+
+export const UpdateMeetingProtocolSchema = z.object({
+  protocolId: z.string().uuid(),
+  title: z.string().min(1).optional(),
+  meetingDate: z.string().optional(),
+  meetingType: meetingTypeEnum.optional(),
+  location: z.string().optional(),
+  attendees: z.string().optional(),
+  remarks: z.string().optional(),
+  isPublished: z.boolean().optional(),
+});
+
+export type UpdateMeetingProtocolInput = z.infer<typeof UpdateMeetingProtocolSchema>;
+
+// =====================================================
+// Protocol Item Schemas
+// =====================================================
+
+export const CreateProtocolItemSchema = z.object({
+  protocolId: z.string().uuid(),
+  title: z.string().min(1, 'Titel ist erforderlich'),
+  description: z.string().optional(),
+  responsiblePerson: z.string().optional(),
+  dueDate: z.string().optional(),
+  status: meetingItemStatusEnum.default('offen'),
+  sortOrder: z.number().int().default(0),
+});
+
+export type CreateProtocolItemInput = z.infer<typeof CreateProtocolItemSchema>;
+
+export const UpdateProtocolItemSchema = z.object({
+  itemId: z.string().uuid(),
+  title: z.string().min(1).optional(),
+  description: z.string().optional(),
+  responsiblePerson: z.string().optional(),
+  dueDate: z.string().optional(),
+  status: meetingItemStatusEnum.optional(),
+  sortOrder: z.number().int().optional(),
+});
+
+export type UpdateProtocolItemInput = z.infer<typeof UpdateProtocolItemSchema>;
+
+export const UpdateItemStatusSchema = z.object({
+  itemId: z.string().uuid(),
+  status: meetingItemStatusEnum,
+});
+
+export type UpdateItemStatusInput = z.infer<typeof UpdateItemStatusSchema>;
+
+export const ReorderItemsSchema = z.object({
+  protocolId: z.string().uuid(),
+  itemIds: z.array(z.string().uuid()),
+});
+
+export type ReorderItemsInput = z.infer<typeof ReorderItemsSchema>;
diff --git a/packages/features/sitzungsprotokolle/src/server/actions/meetings-actions.ts b/packages/features/sitzungsprotokolle/src/server/actions/meetings-actions.ts
new file mode 100644
index 000000000..7b40bf5ea
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/server/actions/meetings-actions.ts
@@ -0,0 +1,206 @@
+'use server';
+
+import { z } from 'zod';
+import { revalidatePath } from 'next/cache';
+import { authActionClient } from '@kit/next/safe-action';
+import { getLogger } from '@kit/shared/logger';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+
+import {
+  CreateMeetingProtocolSchema,
+  UpdateMeetingProtocolSchema,
+  CreateProtocolItemSchema,
+  UpdateProtocolItemSchema,
+  UpdateItemStatusSchema,
+  ReorderItemsSchema,
+} from '../../schema/meetings.schema';
+
+import { createMeetingsApi } from '../api';
+
+const REVALIDATION_PATH = '/home/[account]/meetings';
+
+// =====================================================
+// Protocols
+// =====================================================
+
+export const createProtocol = authActionClient
+  .inputSchema(CreateMeetingProtocolSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'meetings.protocol.create' }, 'Protokoll wird erstellt...');
+    const result = await api.createProtocol(input, userId);
+    logger.info({ name: 'meetings.protocol.create' }, 'Protokoll erstellt');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateProtocol = authActionClient
+  .inputSchema(UpdateMeetingProtocolSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'meetings.protocol.update' }, 'Protokoll wird aktualisiert...');
+    const result = await api.updateProtocol(input, userId);
+    logger.info({ name: 'meetings.protocol.update' }, 'Protokoll aktualisiert');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteProtocol = authActionClient
+  .inputSchema(
+    z.object({
+      protocolId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+
+    logger.info({ name: 'meetings.protocol.delete' }, 'Protokoll wird gelöscht...');
+    await api.deleteProtocol(input.protocolId);
+    logger.info({ name: 'meetings.protocol.delete' }, 'Protokoll gelöscht');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Protocol Items
+// =====================================================
+
+export const createProtocolItem = authActionClient
+  .inputSchema(CreateProtocolItemSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'meetings.item.create' }, 'Tagesordnungspunkt wird erstellt...');
+    const result = await api.createItem(input, userId);
+    logger.info({ name: 'meetings.item.create' }, 'Tagesordnungspunkt erstellt');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateProtocolItem = authActionClient
+  .inputSchema(UpdateProtocolItemSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'meetings.item.update' }, 'Tagesordnungspunkt wird aktualisiert...');
+    const result = await api.updateItem(input, userId);
+    logger.info({ name: 'meetings.item.update' }, 'Tagesordnungspunkt aktualisiert');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateItemStatus = authActionClient
+  .inputSchema(UpdateItemStatusSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'meetings.item.status' }, 'Status wird geändert...');
+    const result = await api.updateItemStatus(input, userId);
+    logger.info({ name: 'meetings.item.status' }, 'Status geändert');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteProtocolItem = authActionClient
+  .inputSchema(
+    z.object({
+      itemId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+
+    logger.info({ name: 'meetings.item.delete' }, 'Tagesordnungspunkt wird gelöscht...');
+    await api.deleteItem(input.itemId);
+    logger.info({ name: 'meetings.item.delete' }, 'Tagesordnungspunkt gelöscht');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true };
+  });
+
+export const reorderProtocolItems = authActionClient
+  .inputSchema(ReorderItemsSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+
+    logger.info({ name: 'meetings.items.reorder' }, 'Reihenfolge wird aktualisiert...');
+    await api.reorderItems(input);
+    logger.info({ name: 'meetings.items.reorder' }, 'Reihenfolge aktualisiert');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Attachments
+// =====================================================
+
+export const addProtocolAttachment = authActionClient
+  .inputSchema(
+    z.object({
+      protocolId: z.string().uuid(),
+      fileName: z.string().min(1),
+      filePath: z.string().min(1),
+      fileSize: z.number().int().positive(),
+      mimeType: z.string().min(1),
+    }),
+  )
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'meetings.attachment.add' }, 'Anhang wird hinzugefügt...');
+    const result = await api.addAttachment(
+      input.protocolId,
+      input.fileName,
+      input.filePath,
+      input.fileSize,
+      input.mimeType,
+      userId,
+    );
+    logger.info({ name: 'meetings.attachment.add' }, 'Anhang hinzugefügt');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteProtocolAttachment = authActionClient
+  .inputSchema(
+    z.object({
+      attachmentId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createMeetingsApi(client);
+
+    logger.info({ name: 'meetings.attachment.delete' }, 'Anhang wird gelöscht...');
+    await api.deleteAttachment(input.attachmentId);
+    logger.info({ name: 'meetings.attachment.delete' }, 'Anhang gelöscht');
+    revalidatePath(REVALIDATION_PATH, 'page');
+    return { success: true };
+  });
diff --git a/packages/features/sitzungsprotokolle/src/server/api.ts b/packages/features/sitzungsprotokolle/src/server/api.ts
new file mode 100644
index 000000000..690dadc27
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/src/server/api.ts
@@ -0,0 +1,394 @@
+import type { Database } from '@kit/supabase/database';
+import type { SupabaseClient } from '@supabase/supabase-js';
+
+import type {
+  CreateMeetingProtocolInput,
+  UpdateMeetingProtocolInput,
+  CreateProtocolItemInput,
+  UpdateProtocolItemInput,
+  UpdateItemStatusInput,
+  ReorderItemsInput,
+} from '../schema/meetings.schema';
+
+/**
+ * Factory for the Sitzungsprotokolle (Meeting Protocols) API.
+ */
+export function createMeetingsApi(client: SupabaseClient<Database>) {
+  return {
+    // =====================================================
+    // Protocols
+    // =====================================================
+
+    async listProtocols(
+      accountId: string,
+      opts?: {
+        search?: string;
+        meetingType?: string;
+        year?: number;
+        page?: number;
+        pageSize?: number;
+      },
+    ) {
+      let query = client
+        .from('meeting_protocols')
+        .select(
+          'id, title, meeting_date, meeting_type, location, attendees, remarks, is_published, created_at, updated_at',
+          { count: 'exact' },
+        )
+        .eq('account_id', accountId)
+        .order('meeting_date', { ascending: false });
+
+      if (opts?.search) {
+        query = query.or(
+          `title.ilike.%${opts.search}%,location.ilike.%${opts.search}%,attendees.ilike.%${opts.search}%`,
+        );
+      }
+
+      if (opts?.meetingType) {
+        query = query.eq('meeting_type', opts.meetingType);
+      }
+
+      if (opts?.year) {
+        query = query
+          .gte('meeting_date', `${opts.year}-01-01`)
+          .lte('meeting_date', `${opts.year}-12-31`);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 25;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async getProtocol(protocolId: string) {
+      const { data, error } = await client
+        .from('meeting_protocols')
+        .select('*')
+        .eq('id', protocolId)
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async createProtocol(input: CreateMeetingProtocolInput, userId: string) {
+      const { data, error } = await client
+        .from('meeting_protocols')
+        .insert({
+          account_id: input.accountId,
+          title: input.title,
+          meeting_date: input.meetingDate,
+          meeting_type: input.meetingType,
+          location: input.location,
+          attendees: input.attendees,
+          remarks: input.remarks,
+          is_published: input.isPublished,
+          created_by: userId,
+          updated_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateProtocol(input: UpdateMeetingProtocolInput, userId: string) {
+      const updateData: Record<string, unknown> = { updated_by: userId };
+
+      if (input.title !== undefined) updateData.title = input.title;
+      if (input.meetingDate !== undefined) updateData.meeting_date = input.meetingDate;
+      if (input.meetingType !== undefined) updateData.meeting_type = input.meetingType;
+      if (input.location !== undefined) updateData.location = input.location;
+      if (input.attendees !== undefined) updateData.attendees = input.attendees;
+      if (input.remarks !== undefined) updateData.remarks = input.remarks;
+      if (input.isPublished !== undefined) updateData.is_published = input.isPublished;
+
+      const { data, error } = await client
+        .from('meeting_protocols')
+        .update(updateData)
+        .eq('id', input.protocolId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteProtocol(protocolId: string) {
+      const { error } = await client
+        .from('meeting_protocols')
+        .delete()
+        .eq('id', protocolId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Protocol Items (Tagesordnungspunkte)
+    // =====================================================
+
+    async listItems(
+      protocolId: string,
+      opts?: { status?: string },
+    ) {
+      let query = client
+        .from('meeting_protocol_items')
+        .select(
+          'id, protocol_id, title, description, responsible_person, due_date, status, sort_order, created_at, updated_at',
+        )
+        .eq('protocol_id', protocolId)
+        .order('sort_order')
+        .order('created_at');
+
+      if (opts?.status) {
+        query = query.eq('status', opts.status);
+      }
+
+      const { data, error } = await query;
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createItem(input: CreateProtocolItemInput, userId: string) {
+      const { data, error } = await client
+        .from('meeting_protocol_items')
+        .insert({
+          protocol_id: input.protocolId,
+          title: input.title,
+          description: input.description,
+          responsible_person: input.responsiblePerson,
+          due_date: input.dueDate,
+          status: input.status,
+          sort_order: input.sortOrder,
+          created_by: userId,
+          updated_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateItem(input: UpdateProtocolItemInput, userId: string) {
+      const updateData: Record<string, unknown> = { updated_by: userId };
+
+      if (input.title !== undefined) updateData.title = input.title;
+      if (input.description !== undefined) updateData.description = input.description;
+      if (input.responsiblePerson !== undefined) updateData.responsible_person = input.responsiblePerson;
+      if (input.dueDate !== undefined) updateData.due_date = input.dueDate;
+      if (input.status !== undefined) updateData.status = input.status;
+      if (input.sortOrder !== undefined) updateData.sort_order = input.sortOrder;
+
+      const { data, error } = await client
+        .from('meeting_protocol_items')
+        .update(updateData)
+        .eq('id', input.itemId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateItemStatus(input: UpdateItemStatusInput, userId: string) {
+      const { data, error } = await client
+        .from('meeting_protocol_items')
+        .update({
+          status: input.status,
+          updated_by: userId,
+        })
+        .eq('id', input.itemId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteItem(itemId: string) {
+      const { error } = await client
+        .from('meeting_protocol_items')
+        .delete()
+        .eq('id', itemId);
+      if (error) throw error;
+    },
+
+    async reorderItems(input: ReorderItemsInput) {
+      // Update sort_order for each item based on position in the array
+      const updates = input.itemIds.map((itemId, index) =>
+        client
+          .from('meeting_protocol_items')
+          .update({ sort_order: index })
+          .eq('id', itemId)
+          .eq('protocol_id', input.protocolId),
+      );
+
+      await Promise.all(updates);
+    },
+
+    // =====================================================
+    // Open Tasks (cross-protocol)
+    // =====================================================
+
+    async listOpenTasks(
+      accountId: string,
+      opts?: { page?: number; pageSize?: number },
+    ) {
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 50;
+
+      const { data, error, count } = await client
+        .from('meeting_protocol_items')
+        .select(
+          'id, protocol_id, title, description, responsible_person, due_date, status, sort_order, created_at, updated_at, meeting_protocols!inner ( id, title, meeting_date, meeting_type, account_id )',
+          { count: 'exact' },
+        )
+        .eq('meeting_protocols.account_id', accountId)
+        .in('status', ['offen', 'in_bearbeitung'])
+        .order('due_date', { ascending: true, nullsFirst: false })
+        .range((page - 1) * pageSize, page * pageSize - 1);
+
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    // =====================================================
+    // Attachments
+    // =====================================================
+
+    async listAttachments(protocolId: string) {
+      const { data, error } = await client
+        .from('meeting_protocol_attachments')
+        .select(
+          'id, protocol_id, file_name, file_path, file_size, mime_type, created_at',
+        )
+        .eq('protocol_id', protocolId)
+        .order('created_at');
+
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async addAttachment(
+      protocolId: string,
+      fileName: string,
+      filePath: string,
+      fileSize: number,
+      mimeType: string,
+      userId: string,
+    ) {
+      const { data, error } = await client
+        .from('meeting_protocol_attachments')
+        .insert({
+          protocol_id: protocolId,
+          file_name: fileName,
+          file_path: filePath,
+          file_size: fileSize,
+          mime_type: mimeType,
+          created_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteAttachment(attachmentId: string) {
+      const { error } = await client
+        .from('meeting_protocol_attachments')
+        .delete()
+        .eq('id', attachmentId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Dashboard Stats
+    // =====================================================
+
+    async getDashboardStats(accountId: string) {
+      const currentYear = new Date().getFullYear();
+
+      const [
+        totalProtocolsResult,
+        thisYearProtocolsResult,
+        openTasksResult,
+        overdueTasksResult,
+      ] = await Promise.all([
+        // Total protocols
+        client
+          .from('meeting_protocols')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId),
+        // Protocols this year
+        client
+          .from('meeting_protocols')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId)
+          .gte('meeting_date', `${currentYear}-01-01`)
+          .lte('meeting_date', `${currentYear}-12-31`),
+        // Open tasks (offen + in_bearbeitung)
+        client
+          .from('meeting_protocol_items')
+          .select(
+            'id, meeting_protocols!inner ( account_id )',
+            { count: 'exact', head: true },
+          )
+          .eq('meeting_protocols.account_id', accountId)
+          .in('status', ['offen', 'in_bearbeitung']),
+        // Overdue tasks
+        client
+          .from('meeting_protocol_items')
+          .select(
+            'id, meeting_protocols!inner ( account_id )',
+            { count: 'exact', head: true },
+          )
+          .eq('meeting_protocols.account_id', accountId)
+          .in('status', ['offen', 'in_bearbeitung'])
+          .lt('due_date', new Date().toISOString().split('T')[0]!),
+      ]);
+
+      return {
+        totalProtocols: totalProtocolsResult.count ?? 0,
+        thisYearProtocols: thisYearProtocolsResult.count ?? 0,
+        openTasks: openTasksResult.count ?? 0,
+        overdueTasks: overdueTasksResult.count ?? 0,
+      };
+    },
+
+    // =====================================================
+    // Recent Protocols (for dashboard)
+    // =====================================================
+
+    async getRecentProtocols(accountId: string, limit = 5) {
+      const { data, error } = await client
+        .from('meeting_protocols')
+        .select('id, title, meeting_date, meeting_type, is_published')
+        .eq('account_id', accountId)
+        .order('meeting_date', { ascending: false })
+        .limit(limit);
+
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    // =====================================================
+    // Overdue Tasks (for dashboard)
+    // =====================================================
+
+    async getOverdueTasks(accountId: string, limit = 5) {
+      const today = new Date().toISOString().split('T')[0]!;
+
+      const { data, error } = await client
+        .from('meeting_protocol_items')
+        .select(
+          'id, title, responsible_person, due_date, status, meeting_protocols!inner ( id, title, account_id )',
+        )
+        .eq('meeting_protocols.account_id', accountId)
+        .in('status', ['offen', 'in_bearbeitung'])
+        .lt('due_date', today)
+        .order('due_date', { ascending: true })
+        .limit(limit);
+
+      if (error) throw error;
+      return data ?? [];
+    },
+  };
+}
diff --git a/packages/features/sitzungsprotokolle/tsconfig.json b/packages/features/sitzungsprotokolle/tsconfig.json
new file mode 100644
index 000000000..090f168aa
--- /dev/null
+++ b/packages/features/sitzungsprotokolle/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "@kit/tsconfig/base.json",
+  "compilerOptions": { "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" },
+  "include": ["*.ts", "*.tsx", "src"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/features/verbandsverwaltung/package.json b/packages/features/verbandsverwaltung/package.json
new file mode 100644
index 000000000..10f83912d
--- /dev/null
+++ b/packages/features/verbandsverwaltung/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "@kit/verbandsverwaltung",
+  "version": "0.1.0",
+  "private": true,
+  "typesVersions": {
+    "*": {
+      "*": [
+        "src/*"
+      ]
+    }
+  },
+  "exports": {
+    "./api": "./src/server/api.ts",
+    "./schema/*": "./src/schema/*.ts",
+    "./components": "./src/components/index.ts",
+    "./actions/*": "./src/server/actions/*.ts",
+    "./lib/*": "./src/lib/*.ts"
+  },
+  "scripts": {
+    "clean": "git clean -xdf .turbo node_modules",
+    "typecheck": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "@hookform/resolvers": "catalog:",
+    "@kit/next": "workspace:*",
+    "@kit/shared": "workspace:*",
+    "@kit/supabase": "workspace:*",
+    "@kit/tsconfig": "workspace:*",
+    "@kit/ui": "workspace:*",
+    "@supabase/supabase-js": "catalog:",
+    "@types/react": "catalog:",
+    "lucide-react": "catalog:",
+    "next": "catalog:",
+    "next-safe-action": "catalog:",
+    "react": "catalog:",
+    "react-hook-form": "catalog:",
+    "recharts": "catalog:",
+    "zod": "catalog:"
+  }
+}
diff --git a/packages/features/verbandsverwaltung/src/components/club-contacts-manager.tsx b/packages/features/verbandsverwaltung/src/components/club-contacts-manager.tsx
new file mode 100644
index 000000000..91b4d68af
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/components/club-contacts-manager.tsx
@@ -0,0 +1,273 @@
+'use client';
+
+import { useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useAction } from 'next-safe-action/hooks';
+
+import { Plus, Pencil, Trash2, Star } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { Input } from '@kit/ui/input';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@kit/ui/form';
+import { toast } from '@kit/ui/sonner';
+
+import { CreateClubContactSchema } from '../schema/verband.schema';
+import { CONTACT_ROLE_LABELS } from '../lib/verband-constants';
+import {
+  createContact,
+  updateContact,
+  deleteContact,
+} from '../server/actions/verband-actions';
+
+interface ClubContactsManagerProps {
+  clubId: string;
+  contacts: Array<Record<string, unknown>>;
+}
+
+export function ClubContactsManager({ clubId, contacts }: ClubContactsManagerProps) {
+  const [showForm, setShowForm] = useState(false);
+  const [editingId, setEditingId] = useState<string | null>(null);
+
+  const form = useForm({
+    resolver: zodResolver(CreateClubContactSchema),
+    defaultValues: {
+      clubId,
+      firstName: '',
+      lastName: '',
+      role: 'sonstige' as const,
+      phone: '',
+      email: '',
+      isPrimary: false,
+    },
+  });
+
+  const { execute: executeCreate, isPending: isCreating } = useAction(createContact, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success('Kontakt erstellt');
+        setShowForm(false);
+        form.reset({ clubId, firstName: '', lastName: '', role: 'sonstige', phone: '', email: '', isPrimary: false });
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Erstellen');
+    },
+  });
+
+  const { execute: executeUpdate, isPending: isUpdating } = useAction(updateContact, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success('Kontakt aktualisiert');
+        setEditingId(null);
+        setShowForm(false);
+        form.reset({ clubId, firstName: '', lastName: '', role: 'sonstige', phone: '', email: '', isPrimary: false });
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Aktualisieren');
+    },
+  });
+
+  const { execute: executeDelete } = useAction(deleteContact, {
+    onSuccess: () => {
+      toast.success('Kontakt gelöscht');
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Löschen');
+    },
+  });
+
+  const handleEdit = (contact: Record<string, unknown>) => {
+    setEditingId(String(contact.id));
+    form.reset({
+      clubId,
+      firstName: String(contact.first_name ?? ''),
+      lastName: String(contact.last_name ?? ''),
+      role: (contact.role as 'sonstige') ?? 'sonstige',
+      phone: String(contact.phone ?? ''),
+      email: String(contact.email ?? ''),
+      isPrimary: Boolean(contact.is_primary),
+    });
+    setShowForm(true);
+  };
+
+  const handleSubmit = (data: Record<string, unknown>) => {
+    if (editingId) {
+      executeUpdate({ contactId: editingId, ...data } as Parameters<typeof executeUpdate>[0]);
+    } else {
+      executeCreate(data as Parameters<typeof executeCreate>[0]);
+    }
+  };
+
+  return (
+    <Card>
+      <CardHeader className="flex flex-row items-center justify-between">
+        <CardTitle className="text-base">Ansprechpartner</CardTitle>
+        {!showForm && (
+          <Button size="sm" onClick={() => { setEditingId(null); setShowForm(true); }}>
+            <Plus className="mr-2 h-4 w-4" />
+            Kontakt hinzufügen
+          </Button>
+        )}
+      </CardHeader>
+      <CardContent>
+        {showForm && (
+          <Form {...form}>
+            <form
+              onSubmit={form.handleSubmit(handleSubmit)}
+              className="mb-4 space-y-4 rounded-lg border p-4"
+            >
+              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+                <FormField
+                  control={form.control}
+                  name="firstName"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Vorname *</FormLabel>
+                      <FormControl><Input {...field} /></FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="lastName"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Nachname *</FormLabel>
+                      <FormControl><Input {...field} /></FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="role"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Funktion</FormLabel>
+                      <FormControl>
+                        <select
+                          {...field}
+                          className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                        >
+                          {Object.entries(CONTACT_ROLE_LABELS).map(([value, label]) => (
+                            <option key={value} value={value}>{label}</option>
+                          ))}
+                        </select>
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="phone"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Telefon</FormLabel>
+                      <FormControl><Input type="tel" {...field} /></FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name="email"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>E-Mail</FormLabel>
+                      <FormControl><Input type="email" {...field} /></FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+              <div className="flex justify-end gap-2">
+                <Button
+                  type="button"
+                  variant="outline"
+                  onClick={() => { setShowForm(false); setEditingId(null); }}
+                >
+                  Abbrechen
+                </Button>
+                <Button type="submit" disabled={isCreating || isUpdating}>
+                  {isCreating || isUpdating
+                    ? 'Wird gespeichert...'
+                    : editingId
+                      ? 'Aktualisieren'
+                      : 'Erstellen'}
+                </Button>
+              </div>
+            </form>
+          </Form>
+        )}
+
+        {contacts.length === 0 && !showForm ? (
+          <p className="text-sm text-muted-foreground">Keine Ansprechpartner vorhanden.</p>
+        ) : (
+          <div className="rounded-md border">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="border-b bg-muted/50">
+                  <th className="p-3 text-left font-medium">Name</th>
+                  <th className="p-3 text-left font-medium">Funktion</th>
+                  <th className="p-3 text-left font-medium">Telefon</th>
+                  <th className="p-3 text-left font-medium">E-Mail</th>
+                  <th className="p-3 text-right font-medium">Aktionen</th>
+                </tr>
+              </thead>
+              <tbody>
+                {contacts.map((contact) => (
+                  <tr key={String(contact.id)} className="border-b">
+                    <td className="p-3 font-medium">
+                      {String(contact.first_name)} {String(contact.last_name)}
+                      {contact.is_primary && (
+                        <Star className="ml-1 inline h-3 w-3 fill-amber-400 text-amber-400" />
+                      )}
+                    </td>
+                    <td className="p-3">
+                      <Badge variant="secondary">
+                        {CONTACT_ROLE_LABELS[String(contact.role)] ?? String(contact.role)}
+                      </Badge>
+                    </td>
+                    <td className="p-3 text-muted-foreground">{String(contact.phone ?? '—')}</td>
+                    <td className="p-3 text-muted-foreground">{String(contact.email ?? '—')}</td>
+                    <td className="p-3 text-right">
+                      <div className="flex justify-end gap-1">
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          onClick={() => handleEdit(contact)}
+                        >
+                          <Pencil className="h-4 w-4" />
+                        </Button>
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          onClick={() => executeDelete({ contactId: String(contact.id) })}
+                        >
+                          <Trash2 className="h-4 w-4 text-destructive" />
+                        </Button>
+                      </div>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/packages/features/verbandsverwaltung/src/components/club-fee-billing-table.tsx b/packages/features/verbandsverwaltung/src/components/club-fee-billing-table.tsx
new file mode 100644
index 000000000..0db0bd1eb
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/components/club-fee-billing-table.tsx
@@ -0,0 +1,142 @@
+'use client';
+
+import { useState } from 'react';
+import { useAction } from 'next-safe-action/hooks';
+
+import { CheckCircle2, Euro, XCircle } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+
+import { BILLING_STATUS_LABELS, BILLING_STATUS_COLORS, PAYMENT_METHOD_LABELS } from '../lib/verband-constants';
+import { markBillingPaid, deleteFeeBilling } from '../server/actions/verband-actions';
+
+interface ClubFeeBillingTableProps {
+  billings: Array<Record<string, unknown>>;
+  clubId: string;
+}
+
+export function ClubFeeBillingTable({ billings, clubId }: ClubFeeBillingTableProps) {
+  const [showPaid, setShowPaid] = useState(false);
+
+  const { execute: executeMarkPaid } = useAction(markBillingPaid, {
+    onSuccess: () => {
+      toast.success('Beitrag als bezahlt markiert');
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Aktualisieren');
+    },
+  });
+
+  const { execute: executeDelete } = useAction(deleteFeeBilling, {
+    onSuccess: () => {
+      toast.success('Beitragsabrechnung gelöscht');
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Löschen');
+    },
+  });
+
+  const filteredBillings = showPaid
+    ? billings
+    : billings.filter((b) => b.status !== 'bezahlt');
+
+  return (
+    <Card>
+      <CardHeader className="flex flex-row items-center justify-between">
+        <CardTitle className="flex items-center gap-2 text-base">
+          <Euro className="h-4 w-4" />
+          Beitragsabrechnungen
+        </CardTitle>
+        <Button
+          variant={showPaid ? 'secondary' : 'outline'}
+          size="sm"
+          onClick={() => setShowPaid(!showPaid)}
+        >
+          {showPaid ? 'Nur offene' : 'Alle anzeigen'}
+        </Button>
+      </CardHeader>
+      <CardContent>
+        {filteredBillings.length === 0 ? (
+          <p className="text-sm text-muted-foreground">Keine Beitragsabrechnungen vorhanden.</p>
+        ) : (
+          <div className="rounded-md border">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="border-b bg-muted/50">
+                  <th className="p-3 text-left font-medium">Beitragsart</th>
+                  <th className="p-3 text-center font-medium">Jahr</th>
+                  <th className="p-3 text-right font-medium">Betrag</th>
+                  <th className="p-3 text-left font-medium">Fällig</th>
+                  <th className="p-3 text-left font-medium">Status</th>
+                  <th className="p-3 text-left font-medium">Zahlung</th>
+                  <th className="p-3 text-right font-medium">Aktionen</th>
+                </tr>
+              </thead>
+              <tbody>
+                {filteredBillings.map((billing) => {
+                  const feeTypeName = (billing.club_fee_types as Record<string, unknown> | null)?.name;
+                  const status = String(billing.status ?? 'offen');
+
+                  return (
+                    <tr key={String(billing.id)} className="border-b">
+                      <td className="p-3 font-medium">
+                        {feeTypeName ? String(feeTypeName) : '—'}
+                      </td>
+                      <td className="p-3 text-center">{String(billing.year)}</td>
+                      <td className="p-3 text-right">
+                        {Number(billing.amount).toLocaleString('de-DE', {
+                          style: 'currency',
+                          currency: 'EUR',
+                        })}
+                      </td>
+                      <td className="p-3 text-muted-foreground">
+                        {billing.due_date
+                          ? new Date(String(billing.due_date)).toLocaleDateString('de-DE')
+                          : '—'}
+                      </td>
+                      <td className="p-3">
+                        <Badge variant={BILLING_STATUS_COLORS[status] as 'default' | 'secondary' | 'destructive' | 'outline' ?? 'outline'}>
+                          {BILLING_STATUS_LABELS[status] ?? status}
+                        </Badge>
+                      </td>
+                      <td className="p-3 text-muted-foreground">
+                        {billing.payment_method
+                          ? PAYMENT_METHOD_LABELS[String(billing.payment_method)] ?? String(billing.payment_method)
+                          : '—'}
+                      </td>
+                      <td className="p-3 text-right">
+                        <div className="flex justify-end gap-1">
+                          {status !== 'bezahlt' && (
+                            <Button
+                              variant="ghost"
+                              size="sm"
+                              onClick={() => executeMarkPaid({ billingId: String(billing.id) })}
+                              title="Als bezahlt markieren"
+                            >
+                              <CheckCircle2 className="h-4 w-4 text-green-600" />
+                            </Button>
+                          )}
+                          <Button
+                            variant="ghost"
+                            size="sm"
+                            onClick={() => executeDelete({ billingId: String(billing.id) })}
+                            title="Löschen"
+                          >
+                            <XCircle className="h-4 w-4 text-destructive" />
+                          </Button>
+                        </div>
+                      </td>
+                    </tr>
+                  );
+                })}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/packages/features/verbandsverwaltung/src/components/club-notes-list.tsx b/packages/features/verbandsverwaltung/src/components/club-notes-list.tsx
new file mode 100644
index 000000000..a78d8cb8f
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/components/club-notes-list.tsx
@@ -0,0 +1,135 @@
+'use client';
+
+import { useAction } from 'next-safe-action/hooks';
+
+import { CheckCircle2, Circle, Trash2, StickyNote, ListTodo, Bell } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+
+import { NOTE_TYPE_LABELS } from '../lib/verband-constants';
+import { completeClubNote, deleteClubNote } from '../server/actions/verband-actions';
+
+interface ClubNotesListProps {
+  notes: Array<Record<string, unknown>>;
+  clubId: string;
+}
+
+const NOTE_ICONS: Record<string, React.ReactNode> = {
+  notiz: <StickyNote className="h-4 w-4" />,
+  aufgabe: <ListTodo className="h-4 w-4" />,
+  erinnerung: <Bell className="h-4 w-4" />,
+};
+
+export function ClubNotesList({ notes, clubId }: ClubNotesListProps) {
+  const { execute: executeComplete } = useAction(completeClubNote, {
+    onSuccess: () => {
+      toast.success('Aufgabe erledigt');
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Aktualisieren');
+    },
+  });
+
+  const { execute: executeDelete } = useAction(deleteClubNote, {
+    onSuccess: () => {
+      toast.success('Notiz gelöscht');
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Löschen');
+    },
+  });
+
+  const openNotes = notes.filter((n) => !n.is_completed);
+  const completedNotes = notes.filter((n) => n.is_completed);
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle className="flex items-center gap-2 text-base">
+          <StickyNote className="h-4 w-4" />
+          Notizen & Aufgaben ({openNotes.length} offen)
+        </CardTitle>
+      </CardHeader>
+      <CardContent>
+        {notes.length === 0 ? (
+          <p className="text-sm text-muted-foreground">Keine Notizen vorhanden.</p>
+        ) : (
+          <div className="space-y-2">
+            {openNotes.map((note) => {
+              const noteType = String(note.note_type ?? 'notiz');
+              return (
+                <div
+                  key={String(note.id)}
+                  className="flex items-start gap-3 rounded-lg border p-3"
+                >
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    className="mt-0.5 h-auto p-0"
+                    onClick={() => executeComplete({ noteId: String(note.id) })}
+                    title="Als erledigt markieren"
+                  >
+                    <Circle className="h-5 w-5 text-muted-foreground" />
+                  </Button>
+                  <div className="flex-1 space-y-1">
+                    <div className="flex items-center gap-2">
+                      <span className="font-medium">{String(note.title)}</span>
+                      <Badge variant="secondary" className="gap-1">
+                        {NOTE_ICONS[noteType]}
+                        {NOTE_TYPE_LABELS[noteType] ?? noteType}
+                      </Badge>
+                      {note.due_date && (
+                        <span className="text-xs text-muted-foreground">
+                          Fällig: {new Date(String(note.due_date)).toLocaleDateString('de-DE')}
+                        </span>
+                      )}
+                    </div>
+                    {note.content && (
+                      <p className="text-sm text-muted-foreground">{String(note.content)}</p>
+                    )}
+                  </div>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => executeDelete({ noteId: String(note.id) })}
+                  >
+                    <Trash2 className="h-4 w-4 text-destructive" />
+                  </Button>
+                </div>
+              );
+            })}
+
+            {completedNotes.length > 0 && (
+              <>
+                <div className="pt-2 text-sm font-medium text-muted-foreground">
+                  Erledigt ({completedNotes.length})
+                </div>
+                {completedNotes.map((note) => (
+                  <div
+                    key={String(note.id)}
+                    className="flex items-start gap-3 rounded-lg border p-3 opacity-60"
+                  >
+                    <CheckCircle2 className="mt-0.5 h-5 w-5 text-green-500" />
+                    <div className="flex-1">
+                      <span className="font-medium line-through">{String(note.title)}</span>
+                    </div>
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      onClick={() => executeDelete({ noteId: String(note.id) })}
+                    >
+                      <Trash2 className="h-4 w-4 text-destructive" />
+                    </Button>
+                  </div>
+                ))}
+              </>
+            )}
+          </div>
+        )}
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/packages/features/verbandsverwaltung/src/components/clubs-data-table.tsx b/packages/features/verbandsverwaltung/src/components/clubs-data-table.tsx
new file mode 100644
index 000000000..5d03a28ac
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/components/clubs-data-table.tsx
@@ -0,0 +1,238 @@
+'use client';
+
+import { useCallback } from 'react';
+import { useForm } from 'react-hook-form';
+import { useRouter, useSearchParams } from 'next/navigation';
+import Link from 'next/link';
+
+import { Plus } from 'lucide-react';
+
+import { Badge } from '@kit/ui/badge';
+import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { Input } from '@kit/ui/input';
+
+interface ClubsDataTableProps {
+  data: Array<Record<string, unknown>>;
+  total: number;
+  page: number;
+  pageSize: number;
+  account: string;
+  types: Array<{ id: string; name: string }>;
+}
+
+export function ClubsDataTable({
+  data,
+  total,
+  page,
+  pageSize,
+  account,
+  types,
+}: ClubsDataTableProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const currentSearch = searchParams.get('q') ?? '';
+  const currentType = searchParams.get('type') ?? '';
+  const showArchived = searchParams.get('archived') === '1';
+  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+
+  const form = useForm({
+    defaultValues: { search: currentSearch },
+  });
+
+  const updateParams = useCallback(
+    (updates: Record<string, string>) => {
+      const params = new URLSearchParams(searchParams.toString());
+      for (const [key, value] of Object.entries(updates)) {
+        if (value) {
+          params.set(key, value);
+        } else {
+          params.delete(key);
+        }
+      }
+      if (!('page' in updates)) {
+        params.delete('page');
+      }
+      router.push(`?${params.toString()}`);
+    },
+    [router, searchParams],
+  );
+
+  const handleSearch = useCallback(
+    (e: React.FormEvent) => {
+      e.preventDefault();
+      updateParams({ q: form.getValues('search') });
+    },
+    [form, updateParams],
+  );
+
+  const handleTypeChange = useCallback(
+    (e: React.ChangeEvent<HTMLSelectElement>) => {
+      updateParams({ type: e.target.value });
+    },
+    [updateParams],
+  );
+
+  const handleArchivedToggle = useCallback(() => {
+    updateParams({ archived: showArchived ? '' : '1' });
+  }, [showArchived, updateParams]);
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      updateParams({ page: String(newPage) });
+    },
+    [updateParams],
+  );
+
+  return (
+    <div className="space-y-4">
+      {/* Toolbar */}
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <form onSubmit={handleSearch} className="flex gap-2">
+          <Input
+            placeholder="Verein suchen..."
+            className="w-64"
+            {...form.register('search')}
+          />
+          <Button type="submit" variant="outline" size="sm">
+            Suchen
+          </Button>
+        </form>
+
+        <div className="flex items-center gap-3">
+          <select
+            value={currentType}
+            onChange={handleTypeChange}
+            className="flex h-9 rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm"
+          >
+            <option value="">Alle Typen</option>
+            {types.map((t) => (
+              <option key={t.id} value={t.id}>
+                {t.name}
+              </option>
+            ))}
+          </select>
+
+          <Button
+            variant={showArchived ? 'secondary' : 'outline'}
+            size="sm"
+            onClick={handleArchivedToggle}
+          >
+            {showArchived ? 'Archivierte ausblenden' : 'Archivierte anzeigen'}
+          </Button>
+
+          <Link href={`/home/${account}/verband/clubs/new`}>
+            <Button size="sm">
+              <Plus className="mr-2 h-4 w-4" />
+              Neuer Verein
+            </Button>
+          </Link>
+        </div>
+      </div>
+
+      {/* Table */}
+      <Card>
+        <CardHeader>
+          <CardTitle>Vereine ({total})</CardTitle>
+        </CardHeader>
+        <CardContent>
+          {data.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed p-12 text-center">
+              <h3 className="text-lg font-semibold">Keine Vereine vorhanden</h3>
+              <p className="mt-1 max-w-sm text-sm text-muted-foreground">
+                Erstellen Sie Ihren ersten Verein, um loszulegen.
+              </p>
+              <Link href={`/home/${account}/verband/clubs/new`} className="mt-4">
+                <Button>Neuer Verein</Button>
+              </Link>
+            </div>
+          ) : (
+            <div className="rounded-md border">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b bg-muted/50">
+                    <th className="p-3 text-left font-medium">Name</th>
+                    <th className="p-3 text-left font-medium">Typ</th>
+                    <th className="p-3 text-right font-medium">Mitglieder</th>
+                    <th className="p-3 text-left font-medium">Ort</th>
+                    <th className="p-3 text-left font-medium">Kontakt</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {data.map((club) => {
+                    const typeName = (club.association_types as Record<string, unknown> | null)?.name;
+                    return (
+                      <tr
+                        key={String(club.id)}
+                        className="cursor-pointer border-b hover:bg-muted/30"
+                        onClick={() =>
+                          router.push(`/home/${account}/verband/clubs/${String(club.id)}`)
+                        }
+                      >
+                        <td className="p-3 font-medium">
+                          <Link
+                            href={`/home/${account}/verband/clubs/${String(club.id)}`}
+                            className="hover:underline"
+                          >
+                            {String(club.name)}
+                          </Link>
+                          {club.is_archived && (
+                            <Badge variant="secondary" className="ml-2">Archiviert</Badge>
+                          )}
+                        </td>
+                        <td className="p-3">
+                          {typeName ? (
+                            <Badge variant="secondary">{String(typeName)}</Badge>
+                          ) : (
+                            <span className="text-muted-foreground">—</span>
+                          )}
+                        </td>
+                        <td className="p-3 text-right">
+                          {club.member_count != null ? Number(club.member_count).toLocaleString('de-DE') : '—'}
+                        </td>
+                        <td className="p-3 text-muted-foreground">
+                          {club.city ? `${String(club.zip ?? '')} ${String(club.city)}`.trim() : '—'}
+                        </td>
+                        <td className="p-3 text-muted-foreground">
+                          {String(club.email ?? club.phone ?? '—')}
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {/* Pagination */}
+          {totalPages > 1 && (
+            <div className="mt-4 flex items-center justify-between">
+              <p className="text-sm text-muted-foreground">
+                Seite {page} von {totalPages} ({total} Einträge)
+              </p>
+              <div className="flex gap-2">
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page <= 1}
+                  onClick={() => handlePageChange(page - 1)}
+                >
+                  Zurück
+                </Button>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  disabled={page >= totalPages}
+                  onClick={() => handlePageChange(page + 1)}
+                >
+                  Weiter
+                </Button>
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/verbandsverwaltung/src/components/create-club-form.tsx b/packages/features/verbandsverwaltung/src/components/create-club-form.tsx
new file mode 100644
index 000000000..4f3245c79
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/components/create-club-form.tsx
@@ -0,0 +1,336 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { useAction } from 'next-safe-action/hooks';
+import { useRouter } from 'next/navigation';
+
+import { Button } from '@kit/ui/button';
+import { Input } from '@kit/ui/input';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@kit/ui/form';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+import { toast } from '@kit/ui/sonner';
+
+import { CreateMemberClubSchema } from '../schema/verband.schema';
+import { createClub } from '../server/actions/verband-actions';
+
+interface CreateClubFormProps {
+  accountId: string;
+  account: string;
+  types: Array<{ id: string; name: string }>;
+  club?: Record<string, unknown>;
+}
+
+export function CreateClubForm({
+  accountId,
+  account,
+  types,
+  club,
+}: CreateClubFormProps) {
+  const router = useRouter();
+  const isEdit = !!club;
+
+  const form = useForm({
+    resolver: zodResolver(CreateMemberClubSchema),
+    defaultValues: {
+      accountId,
+      name: (club?.name as string) ?? '',
+      shortName: (club?.short_name as string) ?? '',
+      associationTypeId: (club?.association_type_id as string) ?? undefined,
+      memberCount: club?.member_count != null ? Number(club.member_count) : undefined,
+      foundedYear: club?.founded_year != null ? Number(club.founded_year) : undefined,
+      street: (club?.street as string) ?? '',
+      zip: (club?.zip as string) ?? '',
+      city: (club?.city as string) ?? '',
+      phone: (club?.phone as string) ?? '',
+      email: (club?.email as string) ?? '',
+      website: (club?.website as string) ?? '',
+      iban: (club?.iban as string) ?? '',
+      bic: (club?.bic as string) ?? '',
+      accountHolder: (club?.account_holder as string) ?? '',
+      isArchived: (club?.is_archived as boolean) ?? false,
+    },
+  });
+
+  const { execute, isPending } = useAction(createClub, {
+    onSuccess: ({ data }) => {
+      if (data?.success) {
+        toast.success(isEdit ? 'Verein aktualisiert' : 'Verein erstellt');
+        router.push(`/home/${account}/verband/clubs`);
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(error.serverError ?? 'Fehler beim Speichern');
+    },
+  });
+
+  return (
+    <Form {...form}>
+      <form
+        onSubmit={form.handleSubmit((data) => execute(data))}
+        className="space-y-6"
+      >
+        {/* Card 1: Grunddaten */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Grunddaten</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Name *</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="shortName"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Kurzname</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="associationTypeId"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Vereinstyp</FormLabel>
+                  <FormControl>
+                    <select
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) => field.onChange(e.target.value || undefined)}
+                      className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+                    >
+                      <option value="">— Kein Typ —</option>
+                      {types.map((t) => (
+                        <option key={t.id} value={t.id}>
+                          {t.name}
+                        </option>
+                      ))}
+                    </select>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="foundedYear"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Gründungsjahr</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      min={1800}
+                      max={2100}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="memberCount"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Mitgliederanzahl</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      min={0}
+                      {...field}
+                      value={field.value ?? ''}
+                      onChange={(e) =>
+                        field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Card 2: Adresse */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Adresse</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <div className="sm:col-span-2">
+              <FormField
+                control={form.control}
+                name="street"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Straße</FormLabel>
+                    <FormControl>
+                      <Input {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+            <FormField
+              control={form.control}
+              name="zip"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>PLZ</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="city"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Ort</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="phone"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Telefon</FormLabel>
+                  <FormControl>
+                    <Input type="tel" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="email"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>E-Mail</FormLabel>
+                  <FormControl>
+                    <Input type="email" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="website"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Website</FormLabel>
+                  <FormControl>
+                    <Input type="url" placeholder="https://" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Card 3: Bankdaten */}
+        <Card>
+          <CardHeader>
+            <CardTitle>Bankdaten</CardTitle>
+          </CardHeader>
+          <CardContent className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="accountHolder"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Kontoinhaber</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="iban"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>IBAN</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="bic"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>BIC</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </CardContent>
+        </Card>
+
+        {/* Submit */}
+        <div className="flex justify-end gap-2">
+          <Button type="button" variant="outline" onClick={() => router.back()}>
+            Abbrechen
+          </Button>
+          <Button type="submit" disabled={isPending}>
+            {isPending
+              ? 'Wird gespeichert...'
+              : isEdit
+                ? 'Verein aktualisieren'
+                : 'Verein erstellen'}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+}
diff --git a/packages/features/verbandsverwaltung/src/components/index.ts b/packages/features/verbandsverwaltung/src/components/index.ts
new file mode 100644
index 000000000..1f71de200
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/components/index.ts
@@ -0,0 +1,7 @@
+export { VerbandTabNavigation } from './verband-tab-navigation';
+export { VerbandDashboard } from './verband-dashboard';
+export { ClubsDataTable } from './clubs-data-table';
+export { CreateClubForm } from './create-club-form';
+export { ClubContactsManager } from './club-contacts-manager';
+export { ClubFeeBillingTable } from './club-fee-billing-table';
+export { ClubNotesList } from './club-notes-list';
diff --git a/packages/features/verbandsverwaltung/src/components/verband-dashboard.tsx b/packages/features/verbandsverwaltung/src/components/verband-dashboard.tsx
new file mode 100644
index 000000000..3e67dcbf8
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/components/verband-dashboard.tsx
@@ -0,0 +1,172 @@
+'use client';
+
+import Link from 'next/link';
+
+import {
+  Building2,
+  Users,
+  Euro,
+  StickyNote,
+  Archive,
+  AlertTriangle,
+} from 'lucide-react';
+
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+interface DashboardStats {
+  activeClubsCount: number;
+  archivedClubsCount: number;
+  typesCount: number;
+  unpaidBillingsCount: number;
+  unpaidAmount: number;
+  openNotesCount: number;
+  totalMembers: number;
+  clubsWithoutContact: Array<{ id: string; name: string }>;
+}
+
+interface VerbandDashboardProps {
+  stats: DashboardStats;
+  account: string;
+}
+
+export function VerbandDashboard({ stats, account }: VerbandDashboardProps) {
+  return (
+    <div className="flex w-full flex-col gap-6">
+      {/* Header */}
+      <div>
+        <h1 className="text-2xl font-bold">Verbandsverwaltung – Übersicht</h1>
+        <p className="text-muted-foreground">
+          Vereine, Beiträge, Kontakte und Aufgaben verwalten
+        </p>
+      </div>
+
+      {/* Stats Grid */}
+      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
+        <Link href={`/home/${account}/verband/clubs`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Aktive Vereine</p>
+                  <p className="text-2xl font-bold">{stats.activeClubsCount}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <Building2 className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Card>
+          <CardContent className="p-6">
+            <div className="flex items-center justify-between">
+              <div className="space-y-1">
+                <p className="text-sm font-medium text-muted-foreground">Gesamtmitglieder</p>
+                <p className="text-2xl font-bold">{stats.totalMembers.toLocaleString('de-DE')}</p>
+              </div>
+              <div className="rounded-full bg-primary/10 p-3 text-primary">
+                <Users className="h-5 w-5" />
+              </div>
+            </div>
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardContent className="p-6">
+            <div className="flex items-center justify-between">
+              <div className="space-y-1">
+                <p className="text-sm font-medium text-muted-foreground">Offene Beiträge</p>
+                <p className="text-2xl font-bold">
+                  {stats.unpaidAmount.toLocaleString('de-DE', {
+                    style: 'currency',
+                    currency: 'EUR',
+                  })}
+                </p>
+                <p className="text-xs text-muted-foreground">{stats.unpaidBillingsCount} Rechnungen</p>
+              </div>
+              <div className="rounded-full bg-primary/10 p-3 text-primary">
+                <Euro className="h-5 w-5" />
+              </div>
+            </div>
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardContent className="p-6">
+            <div className="flex items-center justify-between">
+              <div className="space-y-1">
+                <p className="text-sm font-medium text-muted-foreground">Offene Aufgaben</p>
+                <p className="text-2xl font-bold">{stats.openNotesCount}</p>
+              </div>
+              <div className="rounded-full bg-primary/10 p-3 text-primary">
+                <StickyNote className="h-5 w-5" />
+              </div>
+            </div>
+          </CardContent>
+        </Card>
+
+        <Link href={`/home/${account}/verband/settings`}>
+          <Card className="cursor-pointer transition-shadow hover:shadow-md">
+            <CardContent className="p-6">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-medium text-muted-foreground">Vereinstypen</p>
+                  <p className="text-2xl font-bold">{stats.typesCount}</p>
+                </div>
+                <div className="rounded-full bg-primary/10 p-3 text-primary">
+                  <Building2 className="h-5 w-5" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </Link>
+
+        <Card>
+          <CardContent className="p-6">
+            <div className="flex items-center justify-between">
+              <div className="space-y-1">
+                <p className="text-sm font-medium text-muted-foreground">Archivierte Vereine</p>
+                <p className="text-2xl font-bold">{stats.archivedClubsCount}</p>
+              </div>
+              <div className="rounded-full bg-primary/10 p-3 text-primary">
+                <Archive className="h-5 w-5" />
+              </div>
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+
+      {/* Clubs without contact */}
+      <Card>
+        <CardHeader>
+          <CardTitle className="flex items-center gap-2 text-base">
+            <AlertTriangle className="h-4 w-4 text-amber-500" />
+            Vereine ohne Ansprechpartner
+          </CardTitle>
+        </CardHeader>
+        <CardContent>
+          {stats.clubsWithoutContact.length === 0 ? (
+            <p className="text-sm text-muted-foreground">
+              Alle Vereine haben mindestens einen Ansprechpartner.
+            </p>
+          ) : (
+            <div className="space-y-2">
+              {stats.clubsWithoutContact.map((club) => (
+                <div key={club.id} className="flex items-center justify-between rounded-lg border p-3">
+                  <span className="text-sm font-medium">{club.name}</span>
+                  <Link
+                    href={`/home/${account}/verband/clubs/${club.id}`}
+                    className="text-sm text-primary hover:underline"
+                  >
+                    Kontakt hinzufügen
+                  </Link>
+                </div>
+              ))}
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/features/verbandsverwaltung/src/components/verband-tab-navigation.tsx b/packages/features/verbandsverwaltung/src/components/verband-tab-navigation.tsx
new file mode 100644
index 000000000..86ecd3aac
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/components/verband-tab-navigation.tsx
@@ -0,0 +1,48 @@
+'use client';
+
+import Link from 'next/link';
+import { cn } from '@kit/ui/utils';
+
+interface VerbandTabNavigationProps {
+  account: string;
+  activeTab: string;
+}
+
+const TABS = [
+  { id: 'overview', label: 'Übersicht', path: '' },
+  { id: 'clubs', label: 'Vereine', path: '/clubs' },
+  { id: 'statistics', label: 'Statistik', path: '/statistics' },
+  { id: 'settings', label: 'Einstellungen', path: '/settings' },
+] as const;
+
+export function VerbandTabNavigation({
+  account,
+  activeTab,
+}: VerbandTabNavigationProps) {
+  const basePath = `/home/${account}/verband`;
+
+  return (
+    <div className="mb-6 border-b">
+      <nav className="-mb-px flex space-x-1 overflow-x-auto" aria-label="Verbandsverwaltung Navigation">
+        {TABS.map((tab) => {
+          const isActive = tab.id === activeTab;
+
+          return (
+            <Link
+              key={tab.id}
+              href={`${basePath}${tab.path}`}
+              className={cn(
+                'whitespace-nowrap border-b-2 px-4 py-2.5 text-sm font-medium transition-colors',
+                isActive
+                  ? 'border-primary text-primary'
+                  : 'border-transparent text-muted-foreground hover:border-muted-foreground/30 hover:text-foreground',
+              )}
+            >
+              {tab.label}
+            </Link>
+          );
+        })}
+      </nav>
+    </div>
+  );
+}
diff --git a/packages/features/verbandsverwaltung/src/lib/verband-constants.ts b/packages/features/verbandsverwaltung/src/lib/verband-constants.ts
new file mode 100644
index 000000000..ac40cb2a1
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/lib/verband-constants.ts
@@ -0,0 +1,76 @@
+/**
+ * German label mappings for all Verbandsverwaltung enums and status colors.
+ */
+
+// =====================================================
+// Association Type Labels
+// =====================================================
+
+export const ASSOCIATION_TYPE_LABELS: Record<string, string> = {
+  sportverein: 'Sportverein',
+  fischereiverein: 'Fischereiverein',
+  schuetzenverein: 'Schützenverein',
+  musikverein: 'Musikverein',
+  kulturverein: 'Kulturverein',
+  foerderverein: 'Förderverein',
+  jugendverein: 'Jugendverein',
+  sonstige: 'Sonstige',
+};
+
+// =====================================================
+// Payment Method Labels
+// =====================================================
+
+export const PAYMENT_METHOD_LABELS: Record<string, string> = {
+  bar: 'Bar',
+  lastschrift: 'Lastschrift',
+  ueberweisung: 'Überweisung',
+  paypal: 'PayPal',
+};
+
+// =====================================================
+// Billing Status Labels
+// =====================================================
+
+export const BILLING_STATUS_LABELS: Record<string, string> = {
+  offen: 'Offen',
+  bezahlt: 'Bezahlt',
+  ueberfaellig: 'Überfällig',
+  storniert: 'Storniert',
+};
+
+// =====================================================
+// Billing Status Colors (Badge variants)
+// =====================================================
+
+export const BILLING_STATUS_COLORS: Record<string, string> = {
+  offen: 'outline',
+  bezahlt: 'default',
+  ueberfaellig: 'destructive',
+  storniert: 'secondary',
+};
+
+// =====================================================
+// Note Type Labels
+// =====================================================
+
+export const NOTE_TYPE_LABELS: Record<string, string> = {
+  notiz: 'Notiz',
+  aufgabe: 'Aufgabe',
+  erinnerung: 'Erinnerung',
+};
+
+// =====================================================
+// Contact Role Labels
+// =====================================================
+
+export const CONTACT_ROLE_LABELS: Record<string, string> = {
+  vorsitzender: 'Vorsitzender',
+  stellvertreter: 'Stellvertreter',
+  kassier: 'Kassier',
+  schriftfuehrer: 'Schriftführer',
+  jugendwart: 'Jugendwart',
+  sportwart: 'Sportwart',
+  beisitzer: 'Beisitzer',
+  sonstige: 'Sonstige',
+};
diff --git a/packages/features/verbandsverwaltung/src/schema/verband.schema.ts b/packages/features/verbandsverwaltung/src/schema/verband.schema.ts
new file mode 100644
index 000000000..acf25772e
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/schema/verband.schema.ts
@@ -0,0 +1,196 @@
+import { z } from 'zod';
+
+// =====================================================
+// Enum Schemas
+// =====================================================
+
+export const associationTypeSchema = z.enum([
+  'sportverein',
+  'fischereiverein',
+  'schuetzenverein',
+  'musikverein',
+  'kulturverein',
+  'foerderverein',
+  'jugendverein',
+  'sonstige',
+]);
+
+export const paymentMethodSchema = z.enum([
+  'bar',
+  'lastschrift',
+  'ueberweisung',
+  'paypal',
+]);
+
+export const billingStatusSchema = z.enum([
+  'offen',
+  'bezahlt',
+  'ueberfaellig',
+  'storniert',
+]);
+
+export const noteTypeSchema = z.enum([
+  'notiz',
+  'aufgabe',
+  'erinnerung',
+]);
+
+export const contactRoleSchema = z.enum([
+  'vorsitzender',
+  'stellvertreter',
+  'kassier',
+  'schriftfuehrer',
+  'jugendwart',
+  'sportwart',
+  'beisitzer',
+  'sonstige',
+]);
+
+// =====================================================
+// Type Exports
+// =====================================================
+
+export type AssociationType = z.infer<typeof associationTypeSchema>;
+export type PaymentMethod = z.infer<typeof paymentMethodSchema>;
+export type BillingStatus = z.infer<typeof billingStatusSchema>;
+export type NoteType = z.infer<typeof noteTypeSchema>;
+export type ContactRole = z.infer<typeof contactRoleSchema>;
+
+// =====================================================
+// Member Clubs (Vereine)
+// =====================================================
+
+export const CreateMemberClubSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1, 'Name ist erforderlich').max(256),
+  shortName: z.string().max(32).optional(),
+  associationTypeId: z.string().uuid().optional(),
+  memberCount: z.number().int().min(0).optional(),
+  foundedYear: z.number().int().min(1800).max(2100).optional(),
+  street: z.string().max(256).optional(),
+  zip: z.string().max(10).optional(),
+  city: z.string().max(128).optional(),
+  phone: z.string().max(64).optional(),
+  email: z.string().email().optional().or(z.literal('')),
+  website: z.string().url().optional().or(z.literal('')),
+  iban: z.string().max(34).optional(),
+  bic: z.string().max(11).optional(),
+  accountHolder: z.string().max(256).optional(),
+  isArchived: z.boolean().default(false),
+});
+
+export type CreateMemberClubInput = z.infer<typeof CreateMemberClubSchema>;
+
+export const UpdateMemberClubSchema = CreateMemberClubSchema.partial().extend({
+  clubId: z.string().uuid(),
+});
+
+export type UpdateMemberClubInput = z.infer<typeof UpdateMemberClubSchema>;
+
+// =====================================================
+// Club Contacts (Ansprechpartner)
+// =====================================================
+
+export const CreateClubContactSchema = z.object({
+  clubId: z.string().uuid(),
+  firstName: z.string().min(1, 'Vorname ist erforderlich').max(128),
+  lastName: z.string().min(1, 'Nachname ist erforderlich').max(128),
+  role: contactRoleSchema.default('sonstige'),
+  phone: z.string().max(64).optional(),
+  email: z.string().email().optional().or(z.literal('')),
+  isPrimary: z.boolean().default(false),
+});
+
+export type CreateClubContactInput = z.infer<typeof CreateClubContactSchema>;
+
+export const UpdateClubContactSchema = CreateClubContactSchema.partial().extend({
+  contactId: z.string().uuid(),
+});
+
+export type UpdateClubContactInput = z.infer<typeof UpdateClubContactSchema>;
+
+// =====================================================
+// Club Roles (Funktionen im Verband)
+// =====================================================
+
+export const CreateClubRoleSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1, 'Name ist erforderlich').max(128),
+  description: z.string().max(512).optional(),
+  sortOrder: z.number().int().default(0),
+});
+
+export type CreateClubRoleInput = z.infer<typeof CreateClubRoleSchema>;
+
+// =====================================================
+// Association Types (Vereinstypen)
+// =====================================================
+
+export const CreateAssociationTypeSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1, 'Name ist erforderlich').max(128),
+  description: z.string().max(512).optional(),
+  sortOrder: z.number().int().default(0),
+});
+
+export type CreateAssociationTypeInput = z.infer<typeof CreateAssociationTypeSchema>;
+
+// =====================================================
+// Club Fee Types (Beitragsarten)
+// =====================================================
+
+export const CreateClubFeeTypeSchema = z.object({
+  accountId: z.string().uuid(),
+  name: z.string().min(1, 'Name ist erforderlich').max(128),
+  description: z.string().max(512).optional(),
+  defaultAmount: z.number().min(0).optional(),
+  isActive: z.boolean().default(true),
+});
+
+export type CreateClubFeeTypeInput = z.infer<typeof CreateClubFeeTypeSchema>;
+
+// =====================================================
+// Club Fee Billings (Beitragsabrechnungen)
+// =====================================================
+
+export const CreateClubFeeBillingSchema = z.object({
+  clubId: z.string().uuid(),
+  feeTypeId: z.string().uuid(),
+  year: z.number().int().min(2000).max(2100),
+  amount: z.number().min(0),
+  dueDate: z.string().optional(),
+  paidDate: z.string().optional(),
+  paymentMethod: paymentMethodSchema.optional(),
+  status: billingStatusSchema.default('offen'),
+  notes: z.string().max(1024).optional(),
+});
+
+export type CreateClubFeeBillingInput = z.infer<typeof CreateClubFeeBillingSchema>;
+
+// =====================================================
+// Club Notes (Notizen / Aufgaben)
+// =====================================================
+
+export const CreateClubNoteSchema = z.object({
+  clubId: z.string().uuid(),
+  title: z.string().min(1, 'Titel ist erforderlich').max(256),
+  content: z.string().optional(),
+  noteType: noteTypeSchema.default('notiz'),
+  dueDate: z.string().optional(),
+  isCompleted: z.boolean().default(false),
+});
+
+export type CreateClubNoteInput = z.infer<typeof CreateClubNoteSchema>;
+
+// =====================================================
+// Association History (Verbandshistorie)
+// =====================================================
+
+export const CreateAssociationHistorySchema = z.object({
+  clubId: z.string().uuid(),
+  year: z.number().int().min(1800).max(2100),
+  memberCount: z.number().int().min(0).optional(),
+  notes: z.string().max(2048).optional(),
+});
+
+export type CreateAssociationHistoryInput = z.infer<typeof CreateAssociationHistorySchema>;
diff --git a/packages/features/verbandsverwaltung/src/server/actions/verband-actions.ts b/packages/features/verbandsverwaltung/src/server/actions/verband-actions.ts
new file mode 100644
index 000000000..e4cb34713
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/server/actions/verband-actions.ts
@@ -0,0 +1,472 @@
+'use server';
+
+import { z } from 'zod';
+import { revalidatePath } from 'next/cache';
+import { authActionClient } from '@kit/next/safe-action';
+import { getLogger } from '@kit/shared/logger';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+
+import {
+  CreateMemberClubSchema,
+  UpdateMemberClubSchema,
+  CreateClubContactSchema,
+  UpdateClubContactSchema,
+  CreateClubRoleSchema,
+  CreateAssociationTypeSchema,
+  CreateClubFeeTypeSchema,
+  CreateClubFeeBillingSchema,
+  CreateClubNoteSchema,
+  CreateAssociationHistorySchema,
+} from '../../schema/verband.schema';
+
+import { createVerbandApi } from '../api';
+
+const REVALIDATE_PATH = '/home/[account]/verband';
+
+// =====================================================
+// Clubs (Vereine)
+// =====================================================
+
+export const createClub = authActionClient
+  .inputSchema(CreateMemberClubSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'verband.club.create' }, 'Creating club...');
+    const result = await api.createClub(input, userId);
+    logger.info({ name: 'verband.club.create' }, 'Club created');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateClub = authActionClient
+  .inputSchema(UpdateMemberClubSchema)
+  .action(async ({ parsedInput: input, ctx }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+    const userId = ctx.user.id;
+
+    logger.info({ name: 'verband.club.update' }, 'Updating club...');
+    const result = await api.updateClub(input, userId);
+    logger.info({ name: 'verband.club.update' }, 'Club updated');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const archiveClub = authActionClient
+  .inputSchema(
+    z.object({
+      clubId: z.string().uuid(),
+      accountId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.club.archive' }, 'Archiving club...');
+    await api.archiveClub(input.clubId);
+    logger.info({ name: 'verband.club.archive' }, 'Club archived');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Contacts (Ansprechpartner)
+// =====================================================
+
+export const createContact = authActionClient
+  .inputSchema(CreateClubContactSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.contact.create' }, 'Creating contact...');
+    const result = await api.createContact(input);
+    logger.info({ name: 'verband.contact.create' }, 'Contact created');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateContact = authActionClient
+  .inputSchema(UpdateClubContactSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.contact.update' }, 'Updating contact...');
+    const result = await api.updateContact(input);
+    logger.info({ name: 'verband.contact.update' }, 'Contact updated');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteContact = authActionClient
+  .inputSchema(
+    z.object({
+      contactId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.contact.delete' }, 'Deleting contact...');
+    await api.deleteContact(input.contactId);
+    logger.info({ name: 'verband.contact.delete' }, 'Contact deleted');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Roles (Funktionen)
+// =====================================================
+
+export const createRole = authActionClient
+  .inputSchema(CreateClubRoleSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.role.create' }, 'Creating role...');
+    const result = await api.createRole(input);
+    logger.info({ name: 'verband.role.create' }, 'Role created');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateRole = authActionClient
+  .inputSchema(
+    z.object({
+      roleId: z.string().uuid(),
+      name: z.string().min(1).max(128).optional(),
+      description: z.string().max(512).optional(),
+      sortOrder: z.number().int().optional(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    const { roleId, ...updates } = input;
+    logger.info({ name: 'verband.role.update' }, 'Updating role...');
+    const result = await api.updateRole(roleId, updates);
+    logger.info({ name: 'verband.role.update' }, 'Role updated');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteRole = authActionClient
+  .inputSchema(
+    z.object({
+      roleId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.role.delete' }, 'Deleting role...');
+    await api.deleteRole(input.roleId);
+    logger.info({ name: 'verband.role.delete' }, 'Role deleted');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Association Types (Vereinstypen)
+// =====================================================
+
+export const createAssociationType = authActionClient
+  .inputSchema(CreateAssociationTypeSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.type.create' }, 'Creating association type...');
+    const result = await api.createType(input);
+    logger.info({ name: 'verband.type.create' }, 'Association type created');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateAssociationType = authActionClient
+  .inputSchema(
+    z.object({
+      typeId: z.string().uuid(),
+      name: z.string().min(1).max(128).optional(),
+      description: z.string().max(512).optional(),
+      sortOrder: z.number().int().optional(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    const { typeId, ...updates } = input;
+    logger.info({ name: 'verband.type.update' }, 'Updating association type...');
+    const result = await api.updateType(typeId, updates);
+    logger.info({ name: 'verband.type.update' }, 'Association type updated');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteAssociationType = authActionClient
+  .inputSchema(
+    z.object({
+      typeId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.type.delete' }, 'Deleting association type...');
+    await api.deleteType(input.typeId);
+    logger.info({ name: 'verband.type.delete' }, 'Association type deleted');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Fee Types (Beitragsarten)
+// =====================================================
+
+export const createFeeType = authActionClient
+  .inputSchema(CreateClubFeeTypeSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.feeType.create' }, 'Creating fee type...');
+    const result = await api.createFeeType(input);
+    logger.info({ name: 'verband.feeType.create' }, 'Fee type created');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateFeeType = authActionClient
+  .inputSchema(
+    z.object({
+      feeTypeId: z.string().uuid(),
+      name: z.string().min(1).max(128).optional(),
+      description: z.string().max(512).optional(),
+      defaultAmount: z.number().min(0).optional(),
+      isActive: z.boolean().optional(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    const { feeTypeId, ...updates } = input;
+    logger.info({ name: 'verband.feeType.update' }, 'Updating fee type...');
+    const result = await api.updateFeeType(feeTypeId, updates);
+    logger.info({ name: 'verband.feeType.update' }, 'Fee type updated');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteFeeType = authActionClient
+  .inputSchema(
+    z.object({
+      feeTypeId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.feeType.delete' }, 'Deleting fee type...');
+    await api.deleteFeeType(input.feeTypeId);
+    logger.info({ name: 'verband.feeType.delete' }, 'Fee type deleted');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Fee Billings (Beitragsabrechnungen)
+// =====================================================
+
+export const createFeeBilling = authActionClient
+  .inputSchema(CreateClubFeeBillingSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.billing.create' }, 'Creating fee billing...');
+    const result = await api.createFeeBilling(input);
+    logger.info({ name: 'verband.billing.create' }, 'Fee billing created');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateFeeBilling = authActionClient
+  .inputSchema(
+    CreateClubFeeBillingSchema.partial().extend({
+      billingId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    const { billingId, ...updates } = input;
+    logger.info({ name: 'verband.billing.update' }, 'Updating fee billing...');
+    const result = await api.updateFeeBilling(billingId, updates);
+    logger.info({ name: 'verband.billing.update' }, 'Fee billing updated');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteFeeBilling = authActionClient
+  .inputSchema(
+    z.object({
+      billingId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.billing.delete' }, 'Deleting fee billing...');
+    await api.deleteFeeBilling(input.billingId);
+    logger.info({ name: 'verband.billing.delete' }, 'Fee billing deleted');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true };
+  });
+
+export const markBillingPaid = authActionClient
+  .inputSchema(
+    z.object({
+      billingId: z.string().uuid(),
+      paidDate: z.string().optional(),
+      paymentMethod: z.string().optional(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.billing.markPaid' }, 'Marking billing as paid...');
+    const result = await api.updateFeeBilling(input.billingId, {
+      status: 'bezahlt',
+      paidDate: input.paidDate ?? new Date().toISOString().split('T')[0],
+      paymentMethod: input.paymentMethod as 'bar' | 'lastschrift' | 'ueberweisung' | 'paypal' | undefined,
+    });
+    logger.info({ name: 'verband.billing.markPaid' }, 'Billing marked as paid');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+// =====================================================
+// Notes (Notizen / Aufgaben)
+// =====================================================
+
+export const createClubNote = authActionClient
+  .inputSchema(CreateClubNoteSchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.note.create' }, 'Creating note...');
+    const result = await api.createNote(input);
+    logger.info({ name: 'verband.note.create' }, 'Note created');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const updateClubNote = authActionClient
+  .inputSchema(
+    CreateClubNoteSchema.partial().extend({
+      noteId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    const { noteId, ...updates } = input;
+    logger.info({ name: 'verband.note.update' }, 'Updating note...');
+    const result = await api.updateNote(noteId, updates);
+    logger.info({ name: 'verband.note.update' }, 'Note updated');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const completeClubNote = authActionClient
+  .inputSchema(
+    z.object({
+      noteId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.note.complete' }, 'Completing note...');
+    const result = await api.completeNote(input.noteId);
+    logger.info({ name: 'verband.note.complete' }, 'Note completed');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
+
+export const deleteClubNote = authActionClient
+  .inputSchema(
+    z.object({
+      noteId: z.string().uuid(),
+    }),
+  )
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.note.delete' }, 'Deleting note...');
+    await api.deleteNote(input.noteId);
+    logger.info({ name: 'verband.note.delete' }, 'Note deleted');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true };
+  });
+
+// =====================================================
+// Association History (Verbandshistorie)
+// =====================================================
+
+export const upsertAssociationHistory = authActionClient
+  .inputSchema(CreateAssociationHistorySchema)
+  .action(async ({ parsedInput: input }) => {
+    const client = getSupabaseServerClient();
+    const logger = await getLogger();
+    const api = createVerbandApi(client);
+
+    logger.info({ name: 'verband.history.upsert' }, 'Upserting association history...');
+    const result = await api.upsertHistory(input);
+    logger.info({ name: 'verband.history.upsert' }, 'Association history upserted');
+    revalidatePath(REVALIDATE_PATH, 'page');
+    return { success: true, data: result };
+  });
diff --git a/packages/features/verbandsverwaltung/src/server/api.ts b/packages/features/verbandsverwaltung/src/server/api.ts
new file mode 100644
index 000000000..ca26cfcda
--- /dev/null
+++ b/packages/features/verbandsverwaltung/src/server/api.ts
@@ -0,0 +1,682 @@
+import type { Database } from '@kit/supabase/database';
+import type { SupabaseClient } from '@supabase/supabase-js';
+
+import type {
+  CreateMemberClubInput,
+  UpdateMemberClubInput,
+  CreateClubContactInput,
+  UpdateClubContactInput,
+  CreateClubRoleInput,
+  CreateAssociationTypeInput,
+  CreateClubFeeTypeInput,
+  CreateClubFeeBillingInput,
+  CreateClubNoteInput,
+  CreateAssociationHistoryInput,
+} from '../schema/verband.schema';
+
+/**
+ * Factory for the Verbandsverwaltung (Association Management) API.
+ */
+export function createVerbandApi(client: SupabaseClient<Database>) {
+  return {
+    // =====================================================
+    // Clubs (Vereine)
+    // =====================================================
+
+    async listClubs(
+      accountId: string,
+      opts?: {
+        search?: string;
+        typeId?: string;
+        archived?: boolean;
+        page?: number;
+        pageSize?: number;
+      },
+    ) {
+      let query = client
+        .from('member_clubs')
+        .select(
+          'id, name, short_name, association_type_id, member_count, founded_year, street, zip, city, phone, email, website, iban, bic, account_holder, is_archived, created_at, updated_at, association_types ( id, name )',
+          { count: 'exact' },
+        )
+        .eq('account_id', accountId)
+        .order('name');
+
+      if (opts?.search) {
+        query = query.or(
+          `name.ilike.%${opts.search}%,short_name.ilike.%${opts.search}%,city.ilike.%${opts.search}%`,
+        );
+      }
+
+      if (opts?.typeId) {
+        query = query.eq('association_type_id', opts.typeId);
+      }
+
+      if (opts?.archived !== undefined) {
+        query = query.eq('is_archived', opts.archived);
+      } else {
+        query = query.eq('is_archived', false);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 25;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async getClub(clubId: string) {
+      const { data, error } = await client
+        .from('member_clubs')
+        .select('*, association_types ( id, name )')
+        .eq('id', clubId)
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async createClub(input: CreateMemberClubInput, userId: string) {
+      const { data, error } = await client
+        .from('member_clubs')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          short_name: input.shortName,
+          association_type_id: input.associationTypeId,
+          member_count: input.memberCount,
+          founded_year: input.foundedYear,
+          street: input.street,
+          zip: input.zip,
+          city: input.city,
+          phone: input.phone,
+          email: input.email,
+          website: input.website,
+          iban: input.iban,
+          bic: input.bic,
+          account_holder: input.accountHolder,
+          is_archived: input.isArchived,
+          created_by: userId,
+          updated_by: userId,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateClub(input: UpdateMemberClubInput, userId: string) {
+      const updateData: Record<string, unknown> = { updated_by: userId };
+
+      if (input.name !== undefined) updateData.name = input.name;
+      if (input.shortName !== undefined) updateData.short_name = input.shortName;
+      if (input.associationTypeId !== undefined) updateData.association_type_id = input.associationTypeId;
+      if (input.memberCount !== undefined) updateData.member_count = input.memberCount;
+      if (input.foundedYear !== undefined) updateData.founded_year = input.foundedYear;
+      if (input.street !== undefined) updateData.street = input.street;
+      if (input.zip !== undefined) updateData.zip = input.zip;
+      if (input.city !== undefined) updateData.city = input.city;
+      if (input.phone !== undefined) updateData.phone = input.phone;
+      if (input.email !== undefined) updateData.email = input.email;
+      if (input.website !== undefined) updateData.website = input.website;
+      if (input.iban !== undefined) updateData.iban = input.iban;
+      if (input.bic !== undefined) updateData.bic = input.bic;
+      if (input.accountHolder !== undefined) updateData.account_holder = input.accountHolder;
+      if (input.isArchived !== undefined) updateData.is_archived = input.isArchived;
+
+      const { data, error } = await client
+        .from('member_clubs')
+        .update(updateData)
+        .eq('id', input.clubId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async archiveClub(clubId: string) {
+      const { error } = await client
+        .from('member_clubs')
+        .update({ is_archived: true })
+        .eq('id', clubId);
+      if (error) throw error;
+    },
+
+    async getClubDetail(clubId: string) {
+      const [clubResult, contactsResult, billingsResult, notesResult, historyResult] =
+        await Promise.all([
+          client.from('member_clubs').select('*, association_types ( id, name )').eq('id', clubId).single(),
+          client
+            .from('club_contacts')
+            .select('id, club_id, first_name, last_name, role, phone, email, is_primary, created_at')
+            .eq('club_id', clubId)
+            .order('is_primary', { ascending: false })
+            .order('last_name'),
+          client
+            .from('club_fee_billings')
+            .select('id, club_id, fee_type_id, year, amount, due_date, paid_date, payment_method, status, notes, created_at, club_fee_types ( id, name )')
+            .eq('club_id', clubId)
+            .order('year', { ascending: false })
+            .limit(50),
+          client
+            .from('club_notes')
+            .select('id, club_id, title, content, note_type, due_date, is_completed, created_at, updated_at')
+            .eq('club_id', clubId)
+            .order('created_at', { ascending: false })
+            .limit(50),
+          client
+            .from('association_history')
+            .select('id, club_id, year, member_count, notes, created_at')
+            .eq('club_id', clubId)
+            .order('year', { ascending: false }),
+        ]);
+
+      if (clubResult.error) throw clubResult.error;
+
+      return {
+        club: clubResult.data,
+        contacts: contactsResult.data ?? [],
+        billings: billingsResult.data ?? [],
+        notes: notesResult.data ?? [],
+        history: historyResult.data ?? [],
+      };
+    },
+
+    // =====================================================
+    // Contacts (Ansprechpartner)
+    // =====================================================
+
+    async listContacts(clubId: string) {
+      const { data, error } = await client
+        .from('club_contacts')
+        .select('id, club_id, first_name, last_name, role, phone, email, is_primary, created_at')
+        .eq('club_id', clubId)
+        .order('is_primary', { ascending: false })
+        .order('last_name');
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createContact(input: CreateClubContactInput) {
+      const { data, error } = await client
+        .from('club_contacts')
+        .insert({
+          club_id: input.clubId,
+          first_name: input.firstName,
+          last_name: input.lastName,
+          role: input.role,
+          phone: input.phone,
+          email: input.email,
+          is_primary: input.isPrimary,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateContact(input: UpdateClubContactInput) {
+      const updateData: Record<string, unknown> = {};
+
+      if (input.firstName !== undefined) updateData.first_name = input.firstName;
+      if (input.lastName !== undefined) updateData.last_name = input.lastName;
+      if (input.role !== undefined) updateData.role = input.role;
+      if (input.phone !== undefined) updateData.phone = input.phone;
+      if (input.email !== undefined) updateData.email = input.email;
+      if (input.isPrimary !== undefined) updateData.is_primary = input.isPrimary;
+
+      const { data, error } = await client
+        .from('club_contacts')
+        .update(updateData)
+        .eq('id', input.contactId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteContact(contactId: string) {
+      const { error } = await client
+        .from('club_contacts')
+        .delete()
+        .eq('id', contactId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Roles (Funktionen)
+    // =====================================================
+
+    async listRoles(accountId: string) {
+      const { data, error } = await client
+        .from('club_roles')
+        .select('id, name, description, sort_order, created_at')
+        .eq('account_id', accountId)
+        .order('sort_order')
+        .order('name');
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createRole(input: CreateClubRoleInput) {
+      const { data, error } = await client
+        .from('club_roles')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          description: input.description,
+          sort_order: input.sortOrder,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateRole(roleId: string, updates: { name?: string; description?: string; sortOrder?: number }) {
+      const updateData: Record<string, unknown> = {};
+      if (updates.name !== undefined) updateData.name = updates.name;
+      if (updates.description !== undefined) updateData.description = updates.description;
+      if (updates.sortOrder !== undefined) updateData.sort_order = updates.sortOrder;
+
+      const { data, error } = await client
+        .from('club_roles')
+        .update(updateData)
+        .eq('id', roleId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteRole(roleId: string) {
+      const { error } = await client
+        .from('club_roles')
+        .delete()
+        .eq('id', roleId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Association Types (Vereinstypen)
+    // =====================================================
+
+    async listTypes(accountId: string) {
+      const { data, error } = await client
+        .from('association_types')
+        .select('id, name, description, sort_order, created_at')
+        .eq('account_id', accountId)
+        .order('sort_order')
+        .order('name');
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createType(input: CreateAssociationTypeInput) {
+      const { data, error } = await client
+        .from('association_types')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          description: input.description,
+          sort_order: input.sortOrder,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateType(typeId: string, updates: { name?: string; description?: string; sortOrder?: number }) {
+      const updateData: Record<string, unknown> = {};
+      if (updates.name !== undefined) updateData.name = updates.name;
+      if (updates.description !== undefined) updateData.description = updates.description;
+      if (updates.sortOrder !== undefined) updateData.sort_order = updates.sortOrder;
+
+      const { data, error } = await client
+        .from('association_types')
+        .update(updateData)
+        .eq('id', typeId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteType(typeId: string) {
+      const { error } = await client
+        .from('association_types')
+        .delete()
+        .eq('id', typeId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Fee Types (Beitragsarten)
+    // =====================================================
+
+    async listFeeTypes(accountId: string) {
+      const { data, error } = await client
+        .from('club_fee_types')
+        .select('id, name, description, default_amount, is_active, created_at')
+        .eq('account_id', accountId)
+        .eq('is_active', true)
+        .order('name');
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createFeeType(input: CreateClubFeeTypeInput) {
+      const { data, error } = await client
+        .from('club_fee_types')
+        .insert({
+          account_id: input.accountId,
+          name: input.name,
+          description: input.description,
+          default_amount: input.defaultAmount,
+          is_active: input.isActive,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateFeeType(feeTypeId: string, updates: { name?: string; description?: string; defaultAmount?: number; isActive?: boolean }) {
+      const updateData: Record<string, unknown> = {};
+      if (updates.name !== undefined) updateData.name = updates.name;
+      if (updates.description !== undefined) updateData.description = updates.description;
+      if (updates.defaultAmount !== undefined) updateData.default_amount = updates.defaultAmount;
+      if (updates.isActive !== undefined) updateData.is_active = updates.isActive;
+
+      const { data, error } = await client
+        .from('club_fee_types')
+        .update(updateData)
+        .eq('id', feeTypeId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteFeeType(feeTypeId: string) {
+      const { error } = await client
+        .from('club_fee_types')
+        .delete()
+        .eq('id', feeTypeId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Fee Billings (Beitragsabrechnungen)
+    // =====================================================
+
+    async listFeeBillings(
+      clubId: string,
+      opts?: { year?: number; status?: string; page?: number; pageSize?: number },
+    ) {
+      let query = client
+        .from('club_fee_billings')
+        .select(
+          'id, club_id, fee_type_id, year, amount, due_date, paid_date, payment_method, status, notes, created_at, club_fee_types ( id, name )',
+          { count: 'exact' },
+        )
+        .eq('club_id', clubId)
+        .order('year', { ascending: false });
+
+      if (opts?.year) {
+        query = query.eq('year', opts.year);
+      }
+      if (opts?.status) {
+        query = query.eq('status', opts.status);
+      }
+
+      const page = opts?.page ?? 1;
+      const pageSize = opts?.pageSize ?? 25;
+      query = query.range((page - 1) * pageSize, page * pageSize - 1);
+
+      const { data, error, count } = await query;
+      if (error) throw error;
+      return { data: data ?? [], total: count ?? 0, page, pageSize };
+    },
+
+    async listUnpaidBillings(accountId: string) {
+      const { data, error } = await client
+        .from('club_fee_billings')
+        .select(
+          'id, club_id, fee_type_id, year, amount, due_date, status, member_clubs ( id, name ), club_fee_types ( id, name )',
+        )
+        .eq('member_clubs.account_id', accountId)
+        .in('status', ['offen', 'ueberfaellig'])
+        .order('due_date');
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createFeeBilling(input: CreateClubFeeBillingInput) {
+      const { data, error } = await client
+        .from('club_fee_billings')
+        .insert({
+          club_id: input.clubId,
+          fee_type_id: input.feeTypeId,
+          year: input.year,
+          amount: input.amount,
+          due_date: input.dueDate,
+          paid_date: input.paidDate,
+          payment_method: input.paymentMethod,
+          status: input.status,
+          notes: input.notes,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateFeeBilling(billingId: string, updates: Partial<CreateClubFeeBillingInput>) {
+      const updateData: Record<string, unknown> = {};
+
+      if (updates.feeTypeId !== undefined) updateData.fee_type_id = updates.feeTypeId;
+      if (updates.year !== undefined) updateData.year = updates.year;
+      if (updates.amount !== undefined) updateData.amount = updates.amount;
+      if (updates.dueDate !== undefined) updateData.due_date = updates.dueDate;
+      if (updates.paidDate !== undefined) updateData.paid_date = updates.paidDate;
+      if (updates.paymentMethod !== undefined) updateData.payment_method = updates.paymentMethod;
+      if (updates.status !== undefined) updateData.status = updates.status;
+      if (updates.notes !== undefined) updateData.notes = updates.notes;
+
+      const { data, error } = await client
+        .from('club_fee_billings')
+        .update(updateData)
+        .eq('id', billingId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteFeeBilling(billingId: string) {
+      const { error } = await client
+        .from('club_fee_billings')
+        .delete()
+        .eq('id', billingId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // Notes (Notizen / Aufgaben)
+    // =====================================================
+
+    async listNotes(clubId: string) {
+      const { data, error } = await client
+        .from('club_notes')
+        .select('id, club_id, title, content, note_type, due_date, is_completed, created_at, updated_at')
+        .eq('club_id', clubId)
+        .order('is_completed')
+        .order('created_at', { ascending: false });
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async createNote(input: CreateClubNoteInput) {
+      const { data, error } = await client
+        .from('club_notes')
+        .insert({
+          club_id: input.clubId,
+          title: input.title,
+          content: input.content,
+          note_type: input.noteType,
+          due_date: input.dueDate,
+          is_completed: input.isCompleted,
+        })
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async updateNote(noteId: string, updates: Partial<CreateClubNoteInput>) {
+      const updateData: Record<string, unknown> = {};
+
+      if (updates.title !== undefined) updateData.title = updates.title;
+      if (updates.content !== undefined) updateData.content = updates.content;
+      if (updates.noteType !== undefined) updateData.note_type = updates.noteType;
+      if (updates.dueDate !== undefined) updateData.due_date = updates.dueDate;
+      if (updates.isCompleted !== undefined) updateData.is_completed = updates.isCompleted;
+
+      const { data, error } = await client
+        .from('club_notes')
+        .update(updateData)
+        .eq('id', noteId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async completeNote(noteId: string) {
+      const { data, error } = await client
+        .from('club_notes')
+        .update({ is_completed: true })
+        .eq('id', noteId)
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    async deleteNote(noteId: string) {
+      const { error } = await client
+        .from('club_notes')
+        .delete()
+        .eq('id', noteId);
+      if (error) throw error;
+    },
+
+    // =====================================================
+    // History (Verbandshistorie)
+    // =====================================================
+
+    async listHistory(clubId: string) {
+      const { data, error } = await client
+        .from('association_history')
+        .select('id, club_id, year, member_count, notes, created_at')
+        .eq('club_id', clubId)
+        .order('year', { ascending: false });
+      if (error) throw error;
+      return data ?? [];
+    },
+
+    async upsertHistory(input: CreateAssociationHistoryInput) {
+      const { data, error } = await client
+        .from('association_history')
+        .upsert(
+          {
+            club_id: input.clubId,
+            year: input.year,
+            member_count: input.memberCount,
+            notes: input.notes,
+          },
+          { onConflict: 'club_id,year' },
+        )
+        .select()
+        .single();
+      if (error) throw error;
+      return data;
+    },
+
+    // =====================================================
+    // Dashboard
+    // =====================================================
+
+    async getDashboardStats(accountId: string) {
+      const [
+        clubsResult,
+        archivedResult,
+        typesResult,
+        unpaidResult,
+        notesResult,
+        totalMembersResult,
+      ] = await Promise.all([
+        client
+          .from('member_clubs')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId)
+          .eq('is_archived', false),
+        client
+          .from('member_clubs')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId)
+          .eq('is_archived', true),
+        client
+          .from('association_types')
+          .select('id', { count: 'exact', head: true })
+          .eq('account_id', accountId),
+        client
+          .from('club_fee_billings')
+          .select('id, amount', { count: 'exact' })
+          .in('status', ['offen', 'ueberfaellig']),
+        client
+          .from('club_notes')
+          .select('id', { count: 'exact', head: true })
+          .eq('is_completed', false),
+        client
+          .from('member_clubs')
+          .select('member_count')
+          .eq('account_id', accountId)
+          .eq('is_archived', false),
+      ]);
+
+      const totalMembers = (totalMembersResult.data ?? []).reduce(
+        (sum, c) => sum + (c.member_count ?? 0),
+        0,
+      );
+
+      const unpaidAmount = (unpaidResult.data ?? []).reduce(
+        (sum, b) => sum + ((b as Record<string, unknown>).amount as number ?? 0),
+        0,
+      );
+
+      // Get clubs without contacts
+      const { data: clubsWithoutContact } = await client
+        .from('member_clubs')
+        .select('id, name')
+        .eq('account_id', accountId)
+        .eq('is_archived', false)
+        .not('id', 'in', `(select club_id from club_contacts)`)
+        .limit(10);
+
+      return {
+        activeClubsCount: clubsResult.count ?? 0,
+        archivedClubsCount: archivedResult.count ?? 0,
+        typesCount: typesResult.count ?? 0,
+        unpaidBillingsCount: unpaidResult.count ?? 0,
+        unpaidAmount,
+        openNotesCount: notesResult.count ?? 0,
+        totalMembers,
+        clubsWithoutContact: clubsWithoutContact ?? [],
+      };
+    },
+  };
+}
diff --git a/packages/features/verbandsverwaltung/tsconfig.json b/packages/features/verbandsverwaltung/tsconfig.json
new file mode 100644
index 000000000..090f168aa
--- /dev/null
+++ b/packages/features/verbandsverwaltung/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "@kit/tsconfig/base.json",
+  "compilerOptions": { "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" },
+  "include": ["*.ts", "*.tsx", "src"],
+  "exclude": ["node_modules"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4a183094d..d869e97c5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -256,14 +256,13 @@ catalogs:
 importers:
 
   .:
-    dependencies:
-      '@measured/puck':
-        specifier: 'catalog:'
-        version: 0.20.2(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(use-sync-external-store@1.6.0(react@19.2.4))
     devDependencies:
       '@manypkg/cli':
         specifier: 'catalog:'
         version: 0.25.1
+      '@measured/puck':
+        specifier: 'catalog:'
+        version: 0.20.2(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(use-sync-external-store@1.6.0(react@19.2.4))
       '@react-pdf/renderer':
         specifier: 'catalog:'
         version: 4.3.2(react@19.2.4)
@@ -587,12 +586,21 @@ importers:
         specifier: 'catalog:'
         version: 4.3.6
     devDependencies:
+      '@kit/fischerei':
+        specifier: workspace:*
+        version: link:../../packages/features/fischerei
       '@kit/site-builder':
         specifier: workspace:*
         version: link:../../packages/features/site-builder
+      '@kit/sitzungsprotokolle':
+        specifier: workspace:*
+        version: link:../../packages/features/sitzungsprotokolle
       '@kit/tsconfig':
         specifier: workspace:*
         version: link:../../tooling/typescript
+      '@kit/verbandsverwaltung':
+        specifier: workspace:*
+        version: link:../../packages/features/verbandsverwaltung
       '@next/bundle-analyzer':
         specifier: 'catalog:'
         version: 16.2.1
@@ -1298,6 +1306,54 @@ importers:
         specifier: 'catalog:'
         version: 4.3.6
 
+  packages/features/fischerei:
+    devDependencies:
+      '@hookform/resolvers':
+        specifier: 'catalog:'
+        version: 5.2.2(react-hook-form@7.72.0(react@19.2.4))
+      '@kit/next':
+        specifier: workspace:*
+        version: link:../../next
+      '@kit/shared':
+        specifier: workspace:*
+        version: link:../../shared
+      '@kit/supabase':
+        specifier: workspace:*
+        version: link:../../supabase
+      '@kit/tsconfig':
+        specifier: workspace:*
+        version: link:../../../tooling/typescript
+      '@kit/ui':
+        specifier: workspace:*
+        version: link:../../ui
+      '@supabase/supabase-js':
+        specifier: 'catalog:'
+        version: 2.100.0
+      '@types/react':
+        specifier: 'catalog:'
+        version: 19.2.14
+      lucide-react:
+        specifier: 'catalog:'
+        version: 1.7.0(react@19.2.4)
+      next:
+        specifier: 'catalog:'
+        version: 16.2.1(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      next-safe-action:
+        specifier: 'catalog:'
+        version: 8.1.8(next@16.2.1(@opentelemetry/api@1.9.1)(@playwright/test@1.58.2)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react:
+        specifier: 'catalog:'
+        version: 19.2.4
+      react-hook-form:
+        specifier: 'catalog:'
+        version: 7.72.0(react@19.2.4)
+      recharts:
+        specifier: 'catalog:'
+        version: 3.7.0(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react-is@16.13.1)(react@19.2.4)(redux@5.0.1)
+      zod:
+        specifier: 'catalog:'
+        version: 4.3.6
+
   packages/features/member-management:
     devDependencies:
       '@hookform/resolvers':
@@ -1515,6 +1571,51 @@ importers:
         specifier: 'catalog:'
         version: 4.3.6
 
+  packages/features/sitzungsprotokolle:
+    devDependencies:
+      '@hookform/resolvers':
+        specifier: 'catalog:'
+        version: 5.2.2(react-hook-form@7.72.0(react@19.2.4))
+      '@kit/next':
+        specifier: workspace:*
+        version: link:../../next
+      '@kit/shared':
+        specifier: workspace:*
+        version: link:../../shared
+      '@kit/supabase':
+        specifier: workspace:*
+        version: link:../../supabase
+      '@kit/tsconfig':
+        specifier: workspace:*
+        version: link:../../../tooling/typescript
+      '@kit/ui':
+        specifier: workspace:*
+        version: link:../../ui
+      '@supabase/supabase-js':
+        specifier: 'catalog:'
+        version: 2.100.0
+      '@types/react':
+        specifier: 'catalog:'
+        version: 19.2.14
+      lucide-react:
+        specifier: 'catalog:'
+        version: 1.7.0(react@19.2.4)
+      next:
+        specifier: 'catalog:'
+        version: 16.2.1(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      next-safe-action:
+        specifier: 'catalog:'
+        version: 8.1.8(next@16.2.1(@opentelemetry/api@1.9.1)(@playwright/test@1.58.2)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react:
+        specifier: 'catalog:'
+        version: 19.2.4
+      react-hook-form:
+        specifier: 'catalog:'
+        version: 7.72.0(react@19.2.4)
+      zod:
+        specifier: 'catalog:'
+        version: 4.3.6
+
   packages/features/team-accounts:
     dependencies:
       nanoid:
@@ -1606,6 +1707,54 @@ importers:
         specifier: 'catalog:'
         version: 4.3.6
 
+  packages/features/verbandsverwaltung:
+    devDependencies:
+      '@hookform/resolvers':
+        specifier: 'catalog:'
+        version: 5.2.2(react-hook-form@7.72.0(react@19.2.4))
+      '@kit/next':
+        specifier: workspace:*
+        version: link:../../next
+      '@kit/shared':
+        specifier: workspace:*
+        version: link:../../shared
+      '@kit/supabase':
+        specifier: workspace:*
+        version: link:../../supabase
+      '@kit/tsconfig':
+        specifier: workspace:*
+        version: link:../../../tooling/typescript
+      '@kit/ui':
+        specifier: workspace:*
+        version: link:../../ui
+      '@supabase/supabase-js':
+        specifier: 'catalog:'
+        version: 2.100.0
+      '@types/react':
+        specifier: 'catalog:'
+        version: 19.2.14
+      lucide-react:
+        specifier: 'catalog:'
+        version: 1.7.0(react@19.2.4)
+      next:
+        specifier: 'catalog:'
+        version: 16.2.1(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      next-safe-action:
+        specifier: 'catalog:'
+        version: 8.1.8(next@16.2.1(@opentelemetry/api@1.9.1)(@playwright/test@1.58.2)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react:
+        specifier: 'catalog:'
+        version: 19.2.4
+      react-hook-form:
+        specifier: 'catalog:'
+        version: 7.72.0(react@19.2.4)
+      recharts:
+        specifier: 'catalog:'
+        version: 3.7.0(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react-is@16.13.1)(react@19.2.4)(redux@5.0.1)
+      zod:
+        specifier: 'catalog:'
+        version: 4.3.6
+
   packages/i18n:
     dependencies:
       next-intl:
@@ -14375,7 +14524,7 @@ snapshots:
   caniuse-api@3.0.0:
     dependencies:
       browserslist: 4.28.1
-      caniuse-lite: 1.0.30001778
+      caniuse-lite: 1.0.30001780
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0