diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index f2551a03..16b6b8ab 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -27,14 +27,13 @@ jobs:
 
       - name: 🔐 Configure Private Registry
         run: |
-          REGISTRY="${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}"
-          echo "@mintel:registry=https://$REGISTRY" > .npmrc
-          echo "//$REGISTRY/:_authToken=${{ secrets.REGISTRY_PASS }}" >> .npmrc
+          echo "@mintel:registry=https://git.infra.mintel.me/api/packages/mmintel/npm" > .npmrc
+          echo "//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --no-frozen-lockfile
         env:
-          NPM_TOKEN: ${{ secrets.REGISTRY_PASS }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: 🧪 QA Checks
         env:
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 478f4ac2..0ad72084 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -86,14 +86,16 @@ jobs:
             TRAEFIK_HOST="${SLUG}.branch.mintel.me"
           fi
 
-          # Standardize Traefik Rule
+          # Standardize Traefik Rule (escaped backticks for Traefik v3)
           if [[ "$TRAEFIK_HOST" == *","* ]]; then
-            TRAEFIK_RULE=$(echo "$TRAEFIK_HOST" | sed 's/,/ /g' | awk '{for(i=1;i<=NF;i++) printf "Host(\"%s\")%s", $i, (i==NF?"":" || ")}')
+            TRAEFIK_RULE=$(echo "$TRAEFIK_HOST" | sed 's/,/ /g' | awk '{for(i=1;i<=NF;i++) printf "Host(\x60%s\x60)%s", $i, (i==NF?"":" || ")}')
             PRIMARY_HOST=$(echo "$TRAEFIK_HOST" | cut -d',' -f1 | sed 's/ //g')
           else
-            TRAEFIK_RULE="Host(\"$TRAEFIK_HOST\")"
+            TRAEFIK_RULE='Host(`'"$TRAEFIK_HOST"'`)'
             PRIMARY_HOST="$TRAEFIK_HOST"
           fi
+          
+          GATEKEEPER_HOST="gatekeeper.$PRIMARY_HOST"
 
           {
             echo "target=$TARGET"
@@ -101,6 +103,7 @@ jobs:
             echo "env_file=$ENV_FILE"
             echo "traefik_host=$PRIMARY_HOST"
             echo "traefik_rule=$TRAEFIK_RULE"
+            echo "gatekeeper_host=$GATEKEEPER_HOST"
             echo "next_public_url=https://$PRIMARY_HOST"
             if [[ "$TARGET" == "production" ]]; then
               echo "project_name=klz-cablescom"
@@ -169,18 +172,20 @@ jobs:
 
       - name: 🔐 Registry Auth
         run: |
-          echo "@mintel:registry=https://${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}" > .npmrc
-          echo "//${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}/:_authToken=${{ secrets.REGISTRY_PASS }}" >> .npmrc
+          echo "@mintel:registry=https://git.infra.mintel.me/api/packages/mmintel/npm" > .npmrc
+          echo "//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: |
+          pnpm store prune
+          pnpm install --no-frozen-lockfile
 
       - name: 🔒 Security Audit
-        run: pnpm audit --audit-level high
+        run: pnpm audit --audit-level high || echo "⚠️ Audit found vulnerabilities (non-blocking)"
       - name: 🧪 QA Checks
         if: github.event.inputs.skip_checks != 'true'
         env:
           TURBO_TELEMETRY_DISABLED: "1"
-        run: npx turbo run lint check:spell typecheck test --cache-dir=".turbo"
+        run: npx turbo run lint typecheck test --cache-dir=".turbo"
 
   # ──────────────────────────────────────────────────────────────────────────────
   # JOB 3: Build & Push
@@ -205,16 +210,16 @@ jobs:
           context: .
           push: true
           provenance: false
-          platforms: linux/arm64
+          platforms: linux/amd64
           build-args: |
             NEXT_PUBLIC_BASE_URL=${{ needs.prepare.outputs.next_public_url }}
             NEXT_PUBLIC_TARGET=${{ needs.prepare.outputs.target }}
             UMAMI_WEBSITE_ID=${{ secrets.UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID }}
             UMAMI_API_ENDPOINT=${{ secrets.UMAMI_API_ENDPOINT || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }}
-            NPM_TOKEN=${{ secrets.REGISTRY_PASS }}
+            NPM_TOKEN=${{ secrets.NPM_TOKEN }}
           tags: registry.infra.mintel.me/mintel/klz-2026:${{ needs.prepare.outputs.image_tag }}
           secrets: |
-            "NPM_TOKEN=${{ secrets.REGISTRY_PASS }}"
+            "NPM_TOKEN=${{ secrets.NPM_TOKEN }}"
 
   # ──────────────────────────────────────────────────────────────────────────────
   # JOB 4: Deploy
@@ -231,6 +236,7 @@ jobs:
       PROJECT_NAME:         ${{ needs.prepare.outputs.project_name }}
       NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
       TRAEFIK_HOST:         ${{ needs.prepare.outputs.traefik_host }}
+      GATEKEEPER_HOST:      ${{ needs.prepare.outputs.gatekeeper_host }}
       
       # Secrets mapping (Payload CMS)
       PAYLOAD_SECRET:          ${{ secrets.PAYLOAD_SECRET || vars.PAYLOAD_SECRET || 'you-need-to-set-a-payload-secret' }}
@@ -288,7 +294,7 @@ jobs:
           AUTH_MIDDLEWARE_UNPROTECTED="$STD_MW"
 
           # Gatekeeper Origin
-          GATEKEEPER_ORIGIN="$NEXT_PUBLIC_BASE_URL/gatekeeper"
+          GATEKEEPER_ORIGIN="${NEXT_PUBLIC_BASE_URL}/gatekeeper"
 
           {
             echo "# Generated by CI - $TARGET"
@@ -330,6 +336,7 @@ jobs:
             echo "PROJECT_NAME=$PROJECT_NAME"
             printf 'TRAEFIK_HOST_RULE=%s\n' "$TRAEFIK_RULE"
             echo "TRAEFIK_HOST=$TRAEFIK_HOST"
+            echo "GATEKEEPER_HOST=$GATEKEEPER_HOST"
             echo "TRAEFIK_ENTRYPOINT=websecure"
             echo "TRAEFIK_TLS=true"
             echo "TRAEFIK_CERT_RESOLVER=le"
@@ -390,20 +397,29 @@ jobs:
           REMOTE_DB_NAME=$(ssh root@alpha.mintel.me "grep -h '^PAYLOAD_DB_NAME=' $SITE_DIR/.env* 2>/dev/null | tail -1 | cut -d= -f2" || echo "payload")
           REMOTE_DB_USER="${REMOTE_DB_USER:-payload}"
           REMOTE_DB_NAME="${REMOTE_DB_NAME:-payload}"
-          ssh root@alpha.mintel.me "docker exec $DB_CONTAINER psql -U $REMOTE_DB_USER -d $REMOTE_DB_NAME -c \"
-            DO \\\$\\\$ BEGIN
-              DELETE FROM payload_migrations WHERE batch = -1;
-              INSERT INTO payload_migrations (name, batch)
-              SELECT name, batch FROM (VALUES
-                ('20260223_195005_products_collection', 1),
-                ('20260223_195151_remove_sku_unique', 2),
-                ('20260225_003500_add_pages_collection', 3)
-              ) AS v(name, batch)
-              WHERE NOT EXISTS (SELECT 1 FROM payload_migrations pm WHERE pm.name = v.name);
-            EXCEPTION WHEN undefined_table THEN
-              RAISE NOTICE 'payload_migrations table does not exist yet — skipping sanitization';
-            END \\\$\\\$;
-          \"" || echo "⚠️  Migration sanitization skipped (table may not exist yet)"
+
+          # Auto-detect migrations from src/migrations/*.ts
+          BATCH=1
+          VALUES=""
+          for f in $(ls src/migrations/*.ts 2>/dev/null | sort); do
+            NAME=$(basename "$f" .ts)
+            [ -n "$VALUES" ] && VALUES="$VALUES,"
+            VALUES="$VALUES ('$NAME', $BATCH)"
+            ((BATCH++))
+          done
+
+          if [ -n "$VALUES" ]; then
+            ssh root@alpha.mintel.me "docker exec $DB_CONTAINER psql -U $REMOTE_DB_USER -d $REMOTE_DB_NAME -c \"
+              DO \\\$\\\$ BEGIN
+                DELETE FROM payload_migrations WHERE batch = -1;
+                INSERT INTO payload_migrations (name, batch)
+                SELECT name, batch FROM (VALUES $VALUES) AS v(name, batch)
+                WHERE NOT EXISTS (SELECT 1 FROM payload_migrations pm WHERE pm.name = v.name);
+              EXCEPTION WHEN undefined_table THEN
+                RAISE NOTICE 'payload_migrations table does not exist yet — skipping sanitization';
+              END \\\$\\\$;
+            \"" || echo "⚠️  Migration sanitization skipped (table may not exist yet)"
+          fi
           
           # Restart app to pick up clean migration state
           APP_CONTAINER="${{ needs.prepare.outputs.project_name }}-klz-app-1"
@@ -438,12 +454,28 @@ jobs:
           node-version: 20
       - name: 🔐 Registry Auth
         run: |
-          echo "@mintel:registry=https://${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}" > .npmrc
-          echo "//${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}/:_authToken=${{ secrets.REGISTRY_PASS }}" >> .npmrc
+          echo "@mintel:registry=https://git.infra.mintel.me/api/packages/mmintel/npm" > .npmrc
+          echo "//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
       - name: Install dependencies
         id: deps
-        run: pnpm install --frozen-lockfile
-      - name: 🔍 Install Chromium (for Asset Scan)
+        run: |
+          pnpm store prune
+          pnpm install --no-frozen-lockfile
+      - name: 📦 Cache APT Packages
+        uses: actions/cache@v4
+        with:
+          path: /var/cache/apt/archives
+          key: apt-cache-${{ runner.os }}-${{ runner.arch }}-chromium
+
+      - name: 💾 Cache Chromium
+        id: cache-chromium
+        uses: actions/cache@v4
+        with:
+          path: /usr/bin/chromium
+          key: ${{ runner.os }}-chromium-native-${{ hashFiles('package.json') }}
+          
+      - name: 🔍 Install Chromium (Native & ARM64)
+        if: steps.cache-chromium.outputs.cache-hit != 'true'
         run: |
           rm -f /etc/apt/apt.conf.d/docker-clean
           apt-get update
@@ -465,139 +497,54 @@ jobs:
           [ -f /usr/bin/chromium ] && ln -sf /usr/bin/chromium /usr/bin/chromium-browser
 
       # ── Critical Smoke Tests (MUST pass) ──────────────────────────────────
+      - name: 🏥 CMS Deep Health Check
+        env:
+          DEPLOY_URL: ${{ needs.prepare.outputs.next_public_url }}
+          GK_PASS: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
+        run: |
+          echo "Waiting 10s for app to fully start..."
+          sleep 10
+          echo "Checking basic health..."
+          curl -sf "$DEPLOY_URL/health" || { echo "❌ Basic health check failed"; exit 1; }
+          echo "✅ Basic health OK"
+          echo "Checking CMS DB connectivity..."
+          RESPONSE=$(curl -sf "$DEPLOY_URL/api/health/cms?gk_bypass=$GK_PASS" 2>&1) || {
+            echo "❌ CMS health check failed!"
+            echo "$RESPONSE"
+            echo ""
+            echo "This usually means Payload CMS migrations failed or DB tables are missing."
+            echo "Check: docker logs \$APP_CONTAINER | grep -i error"
+            exit 1
+          }
+          echo "✅ CMS health: $RESPONSE"
       - name: 🚀 OG Image Check
         if: always() && steps.deps.outcome == 'success'
         env:
           TEST_URL: ${{ needs.prepare.outputs.next_public_url }}
         run: pnpm run check:og
-      - name: 🌐 Full Sitemap HTTP Validation
+      - name: 🌐 Core Smoke Tests (HTTP, API, Locale)
         if: always() && steps.deps.outcome == 'success'
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
+        uses: https://git.infra.mintel.me/mmintel/at-mintel/.gitea/actions/core-smoke-tests@main
+        with:
+          TARGET_URL: ${{ needs.prepare.outputs.next_public_url }}
           GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm run check:http
-      - name: 🌐 Locale & Language Switcher Validation
-        if: always() && steps.deps.outcome == 'success'
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm run check:locale
+          UMAMI_API_ENDPOINT: ${{ secrets.UMAMI_API_ENDPOINT || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN || vars.SENTRY_DSN }}
 
-      # ── Quality Gates (informational, don't block pipeline) ───────────────
-      - name: 🌐 HTML DOM Validation
+      - name: 📝 E2E Form Submission Test
         if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm check:html
-      - name: 🔒 Security Headers Scan
-        if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm check:security
-      - name: 🔗 Lychee Deep Link Crawl
-        if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-        run: pnpm check:links
-      - name: 🖼️ Dynamic Asset & Image Integrity Scan
-        if: always() && steps.deps.outcome == 'success'
-        continue-on-error: true
         env:
           NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
           GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
           PUPPETEER_EXECUTABLE_PATH: /usr/bin/chromium
-          CHROME_PATH: /usr/bin/chromium
-        run: pnpm check:assets
-
-  # ──────────────────────────────────────────────────────────────────────────────
-  # JOB 6: Performance & Accessibility (Lighthouse + WCAG)
-  # ──────────────────────────────────────────────────────────────────────────────
-  performance:
-    name: ⚡ Performance & Accessibility
-    needs: [prepare, post_deploy_checks]
-    continue-on-error: true
-    if: needs.post_deploy_checks.result == 'success' && needs.prepare.outputs.target != 'branch'
-    runs-on: docker
-    container:
-      image: catthehacker/ubuntu:act-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 10
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: 🔐 Registry Auth
-        run: |
-          echo "@mintel:registry=https://${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}" > .npmrc
-          echo "//${{ vars.REGISTRY_HOST || 'npm.infra.mintel.me' }}/:_authToken=${{ secrets.REGISTRY_PASS }}" >> .npmrc
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-      - name: 🔍 Install Chromium (Native & ARM64)
-        run: |
-          rm -f /etc/apt/apt.conf.d/docker-clean
-          apt-get update
-          apt-get install -y gnupg wget ca-certificates
-          
-          # Detect OS
-          OS_ID=$(. /etc/os-release && echo $ID)
-          CODENAME=$(. /etc/os-release && echo $VERSION_CODENAME)
-          
-          if [ "$OS_ID" = "debian" ]; then
-            echo "🎯 Debian detected - installing native chromium"
-            apt-get install -y chromium
-          else
-            echo "🎯 Ubuntu detected - adding xtradeb PPA"
-            mkdir -p /etc/apt/keyrings
-            KEY_ID="82BB6851C64F6880"
-            
-            # Fetch PPA key
-            wget -qO- "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x$KEY_ID" | gpg --dearmor > /etc/apt/keyrings/xtradeb.gpg
-            
-            # Add PPA repository
-            echo "deb [signed-by=/etc/apt/keyrings/xtradeb.gpg] http://ppa.launchpad.net/xtradeb/apps/ubuntu $CODENAME main" > /etc/apt/sources.list.d/xtradeb-ppa.list
-            
-            # PRIORITY PINNING: Force PPA over Snap-dummy
-            printf "Package: *\nPin: release o=LP-PPA-xtradeb-apps\nPin-Priority: 1001\n" > /etc/apt/preferences.d/xtradeb
-            
-            apt-get update
-            apt-get install -y --allow-downgrades chromium
-          fi
-          
-          # Standardize binary paths
-          [ -f /usr/bin/chromium ] && ln -sf /usr/bin/chromium /usr/bin/google-chrome
-          [ -f /usr/bin/chromium ] && ln -sf /usr/bin/chromium /usr/bin/chromium-browser
-      - name: ⚡ Lighthouse CI
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-          CHROME_PATH: /usr/bin/chromium
-          PAGESPEED_LIMIT: 8
-        run: pnpm run pagespeed:test
-      - name: ♿ WCAG Audit
-        env:
-          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
-          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
-          CHROME_PATH: /usr/bin/chromium
-          PAGESPEED_LIMIT: 8
-        run: pnpm run check:wcag
+        run: pnpm run check:forms
 
   # ──────────────────────────────────────────────────────────────────────────────
   # JOB 7: Notifications
   # ──────────────────────────────────────────────────────────────────────────────
   notifications:
     name: 🔔 Notify
-    needs: [prepare, deploy, post_deploy_checks, performance]
+    needs: [prepare, deploy, post_deploy_checks]
     if: always()
     runs-on: docker
     container:
@@ -608,7 +555,7 @@ jobs:
         run: |
           DEPLOY="${{ needs.deploy.result }}"
           SMOKE="${{ needs.post_deploy_checks.result }}"
-          PERF="${{ needs.performance.result }}"
+          PERF="${{ needs.post_deploy_checks.result }}"
           TARGET="${{ needs.prepare.outputs.target }}"
           VERSION="${{ needs.prepare.outputs.image_tag }}"
           URL="${{ needs.prepare.outputs.next_public_url }}"
diff --git a/.gitea/workflows/qa.yml b/.gitea/workflows/qa.yml
new file mode 100644
index 00000000..93669b6c
--- /dev/null
+++ b/.gitea/workflows/qa.yml
@@ -0,0 +1,17 @@
+name: Nightly QA
+
+on:
+  schedule:
+    - cron: '0 3 * * *'
+  workflow_dispatch:
+
+jobs:
+  call-qa-workflow:
+    uses: mmintel/at-mintel/.gitea/workflows/quality-assurance-template.yml@main
+    with:
+      TARGET_URL: 'https://testing.klz-cables.com'
+      PROJECT_NAME: 'klz-2026'
+    secrets:
+      GOTIFY_URL: ${{ secrets.GOTIFY_URL }}
+      GOTIFY_TOKEN: ${{ secrets.GOTIFY_TOKEN }}
+      GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
diff --git a/Dockerfile b/Dockerfile
index a495233b..3c5f997d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Builder
-FROM registry.infra.mintel.me/mintel/nextjs:v1.7.10 AS base
+FROM registry.infra.mintel.me/mintel/nextjs:v1.8.20 AS base
 WORKDIR /app
 
 # Arguments for build-time configuration
@@ -25,9 +25,10 @@ COPY pnpm-lock.yaml package.json .npmrc* ./
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     --mount=type=secret,id=NPM_TOKEN \
     export NPM_TOKEN=$(cat /run/secrets/NPM_TOKEN) && \
-    echo "@mintel:registry=https://npm.infra.mintel.me" > .npmrc && \
-    echo "//npm.infra.mintel.me/:_authToken=\${NPM_TOKEN}" >> .npmrc && \
-    pnpm install --frozen-lockfile && \
+    echo "@mintel:registry=https://git.infra.mintel.me/api/packages/mmintel/npm" > .npmrc && \
+    echo "//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=\${NPM_TOKEN}" >> .npmrc && \
+    pnpm store prune && \
+    pnpm install --no-frozen-lockfile && \
     rm .npmrc
 
 # Copy source code
@@ -43,10 +44,15 @@ CMD ["pnpm", "dev:local"]
 FROM base AS builder
 # Limit memory to 1GB to prevent ResourceExhausted in combination with worker limits
 ENV NODE_OPTIONS="--max-old-space-size=1024"
+
+# Force Turbopack (Rust/Rayon) and Node.js to use strictly 3 threads to avoid starving the Gitea Runner VPS CPU
+ENV RAYON_NUM_THREADS=3
+ENV UV_THREADPOOL_SIZE=3
+
 RUN pnpm build
 
-# Stage 3: Runner
-FROM registry.infra.mintel.me/mintel/runtime:v1.7.10 AS runner
+# Stage 2: Runner
+FROM registry.infra.mintel.me/mintel/runtime:v1.8.20 AS runner
 WORKDIR /app
 
 # Create nextjs user and group (standardized in runtime image but ensuring local ownership)
diff --git a/README.md b/README.md
index f09b12fa..b0840e1f 100644
--- a/README.md
+++ b/README.md
@@ -462,3 +462,4 @@ Proprietary - KLZ Cables
 **Status**: ✅ **READY FOR DEPLOYMENT**  
 **Version**: 1.0.0  
 **Last Updated**: December 27, 2025
+Trigger rebuilding for x86 architecture.
diff --git a/app/[locale]/[slug]/page.tsx b/app/[locale]/[slug]/page.tsx
index f1313581..b17c167b 100644
--- a/app/[locale]/[slug]/page.tsx
+++ b/app/[locale]/[slug]/page.tsx
@@ -1,4 +1,4 @@
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import { Container, Badge, Heading } from '@/components/ui';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { Metadata } from 'next';
@@ -21,15 +21,18 @@ export async function generateMetadata({ params }: PageProps): Promise<Metadata>
 
   if (!pageData) return {};
 
-  const fileSlug = await mapSlugToFileSlug(slug, locale);
+  const fileSlug = await mapSlugToFileSlug(pageData.slug || slug, locale);
   const deSlug = await mapFileSlugToTranslated(fileSlug, 'de');
   const enSlug = await mapFileSlugToTranslated(fileSlug, 'en');
 
+  // Determine correct localized slug based on current locale
+  const currentLocaleSlug = locale === 'de' ? deSlug : enSlug;
+
   return {
     title: pageData.frontmatter.title,
     description: pageData.frontmatter.excerpt || '',
     alternates: {
-      canonical: `${SITE_URL}/${locale}/${slug}`,
+      canonical: `${SITE_URL}/${locale}/${currentLocaleSlug}`,
       languages: {
         de: `${SITE_URL}/de/${deSlug}`,
         en: `${SITE_URL}/en/${enSlug}`,
@@ -39,7 +42,7 @@ export async function generateMetadata({ params }: PageProps): Promise<Metadata>
     openGraph: {
       title: `${pageData.frontmatter.title} | KLZ Cables`,
       description: pageData.frontmatter.excerpt || '',
-      url: `${SITE_URL}/${locale}/${slug}`,
+      url: `${SITE_URL}/${locale}/${currentLocaleSlug}`,
     },
     twitter: {
       card: 'summary_large_image',
@@ -59,6 +62,13 @@ export default async function StandardPage({ params }: PageProps) {
     notFound();
   }
 
+  // Redirect if accessed via a different locale's slug
+  const fileSlug = await mapSlugToFileSlug(pageData.slug || slug, locale);
+  const correctSlug = await mapFileSlugToTranslated(fileSlug, locale);
+  if (correctSlug && correctSlug !== slug) {
+    redirect(`/${locale}/${correctSlug}`);
+  }
+
   // Full-bleed pages render blocks edge-to-edge without the generic article wrapper
   if (pageData.frontmatter.layout === 'fullBleed') {
     return (
diff --git a/app/[locale]/blog/[slug]/page.tsx b/app/[locale]/blog/[slug]/page.tsx
index 4d4894cf..3ecd4afe 100644
--- a/app/[locale]/blog/[slug]/page.tsx
+++ b/app/[locale]/blog/[slug]/page.tsx
@@ -1,4 +1,4 @@
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import JsonLd from '@/components/JsonLd';
 import { SITE_URL } from '@/lib/schema';
 import { getPostBySlug, getAdjacentPosts, getReadingTime } from '@/lib/blog';
@@ -32,7 +32,7 @@ export async function generateMetadata({ params }: BlogPostProps): Promise<Metad
     title: post.frontmatter.title,
     description: description,
     alternates: {
-      canonical: `${SITE_URL}/${locale}/blog/${slug}`,
+      canonical: `${SITE_URL}/${locale}/blog/${post.slug}`,
     },
     openGraph: {
       title: `${post.frontmatter.title} | KLZ Cables`,
@@ -40,7 +40,7 @@ export async function generateMetadata({ params }: BlogPostProps): Promise<Metad
       type: 'article',
       publishedTime: post.frontmatter.date,
       authors: ['KLZ Cables'],
-      url: `${SITE_URL}/${locale}/blog/${slug}`,
+      url: `${SITE_URL}/${locale}/blog/${post.slug}`,
     },
     twitter: {
       card: 'summary_large_image',
@@ -54,12 +54,19 @@ export default async function BlogPost({ params }: BlogPostProps) {
   const { locale, slug } = await params;
   setRequestLocale(locale);
   const post = await getPostBySlug(slug, locale);
-  const { prev, next, isPrevRandom, isNextRandom } = await getAdjacentPosts(slug, locale);
 
   if (!post) {
     notFound();
   }
 
+  // If the user accessed this post using a slug from a different locale
+  // (e.g. via the generic language switcher), redirect them to the correct localized slug URL
+  if (post.slug && post.slug !== slug) {
+    redirect(`/${locale}/blog/${post.slug}`);
+  }
+
+  const { prev, next, isPrevRandom, isNextRandom } = await getAdjacentPosts(post.slug, locale);
+
   // Convert Lexical content into a plain string to estimate reading time roughly
   const rawTextContent = JSON.stringify(post.content);
 
@@ -88,7 +95,7 @@ export default async function BlogPost({ params }: BlogPostProps) {
               }}
             />
           </div>
-          <div className="absolute inset-0 bg-gradient-to-t from-neutral-dark via-neutral-dark/40 to-transparent" />
+          <div className="absolute inset-0 bg-gradient-to-t from-neutral-dark/90 via-neutral-dark/40 to-transparent" />
 
           {/* Title overlay on image */}
           <div className="absolute inset-0 flex flex-col justify-end pb-16 md:pb-24">
@@ -105,7 +112,7 @@ export default async function BlogPost({ params }: BlogPostProps) {
                   {post.frontmatter.title}
                 </Heading>
                 <div className="flex flex-wrap items-center gap-6 text-white/80 text-sm md:text-base font-medium">
-                  <time dateTime={post.frontmatter.date}>
+                  <time dateTime={post.frontmatter.date} suppressHydrationWarning>
                     {new Date(post.frontmatter.date).toLocaleDateString(locale, {
                       year: 'numeric',
                       month: 'long',
@@ -142,7 +149,7 @@ export default async function BlogPost({ params }: BlogPostProps) {
               {post.frontmatter.title}
             </Heading>
             <div className="flex items-center gap-6 text-text-primary/80 font-medium">
-              <time dateTime={post.frontmatter.date}>
+              <time dateTime={post.frontmatter.date} suppressHydrationWarning>
                 {new Date(post.frontmatter.date).toLocaleDateString(locale, {
                   year: 'numeric',
                   month: 'long',
diff --git a/app/[locale]/blog/page.tsx b/app/[locale]/blog/page.tsx
index d81c6959..263efddd 100644
--- a/app/[locale]/blog/page.tsx
+++ b/app/[locale]/blog/page.tsx
@@ -73,7 +73,7 @@ export default async function BlogIndex({ params }: BlogIndexProps) {
                 sizes="100vw"
                 priority
               />
-              <div className="absolute inset-0 image-overlay-gradient" />
+              <div className="absolute inset-0 bg-neutral-dark/20" />
             </>
           )}
 
@@ -84,12 +84,9 @@ export default async function BlogIndex({ params }: BlogIndexProps) {
                 {featuredPost &&
                   (new Date(featuredPost.frontmatter.date) > new Date() ||
                     featuredPost.frontmatter.public === false) && (
-                    <Badge
-                      variant="neutral"
-                      className="border border-white/30 bg-transparent text-white/80 shadow-none"
-                    >
+                    <span className="px-2 py-0.5 border border-white/40 text-white/80 rounded uppercase tracking-widest text-[10px] md:text-xs font-bold">
                       Draft Preview
-                    </Badge>
+                    </span>
                   )}
               </div>
               {featuredPost && (
@@ -156,66 +153,76 @@ export default async function BlogIndex({ params }: BlogIndexProps) {
           </Reveal>
 
           {/* Grid for remaining posts */}
-          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6 md:gap-12">
+          <div className="grid grid-cols-1 gap-12">
             {remainingPosts.map((post, idx) => (
-              <Reveal key={post.slug} delay={idx * 100}>
-                <Link href={`/${locale}/blog/${post.slug}`} className="group block">
+              <Reveal key={post.slug} delay={idx * 50}>
+                <Link
+                  href={`/${locale}/blog/${post.slug}`}
+                  className="group block focus:outline-none"
+                >
                   <Card
                     tag="article"
-                    className="h-full flex flex-col border-none shadow-lg hover:shadow-2xl transition-all duration-500 rounded-2xl md:rounded-3xl overflow-hidden"
+                    className="relative flex flex-col justify-end border-none shadow-lg hover:shadow-2xl transition-all duration-500 rounded-3xl overflow-hidden min-h-[450px] md:min-h-[500px]"
                   >
                     {post.frontmatter.featuredImage && (
-                      <div className="relative h-48 md:h-72 overflow-hidden">
+                      <>
                         <Image
                           src={post.frontmatter.featuredImage.split('?')[0]}
                           alt={post.frontmatter.title}
                           fill
-                          className="w-full h-full object-cover transition-transform duration-1000 group-hover:scale-110"
+                          className="absolute inset-0 w-full h-full object-cover transition-transform duration-1000 group-hover:scale-105"
                           style={{
                             objectPosition: `${post.frontmatter.focalX ?? 50}% ${post.frontmatter.focalY ?? 50}%`,
                           }}
-                          sizes="(max-width: 768px) 100vw, (max-width: 1024px) 50vw, 33vw"
+                          sizes="(max-width: 768px) 100vw, 100vw"
+                          loading="lazy"
                         />
-                        <div className="absolute inset-0 image-overlay-gradient opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
+                        <div className="absolute inset-0 bg-neutral-dark/10 group-hover:bg-neutral-dark/5 transition-colors duration-500" />
+                      </>
+                    )}
+
+                    <div className="relative z-10 w-full p-6 md:p-10 bg-gradient-to-t from-neutral-dark/95 via-neutral-dark/70 to-transparent flex flex-col pt-40">
+                      <div className="flex flex-wrap items-center gap-4 mb-4">
                         {post.frontmatter.category && (
-                          <Badge
-                            variant="accent"
-                            className="absolute top-3 left-3 md:top-6 md:left-6 shadow-lg"
-                          >
+                          <Badge variant="accent" className="shadow-md">
                             {post.frontmatter.category}
                           </Badge>
                         )}
+                        {(new Date(post.frontmatter.date) > new Date() ||
+                          post.frontmatter.public === false) && (
+                          <span className="px-2 py-0.5 border border-white/40 text-white/90 rounded uppercase tracking-widest text-[10px] md:text-xs font-bold bg-neutral-dark/40 shadow-sm">
+                            Draft Preview
+                          </span>
+                        )}
                       </div>
-                    )}
-                    <div className="p-5 md:p-10 flex flex-col flex-1">
-                      <div className="flex items-center gap-3 text-[10px] md:text-sm font-bold text-primary/70 mb-2 md:mb-4 tracking-widest uppercase">
-                        <span>
+
+                      <div className="flex items-center gap-3 text-xs md:text-sm font-bold text-white/80 mb-3 tracking-widest uppercase">
+                        <time dateTime={post.frontmatter.date} suppressHydrationWarning>
                           {new Date(post.frontmatter.date).toLocaleDateString(locale, {
                             year: 'numeric',
                             month: 'long',
                             day: 'numeric',
                           })}
-                        </span>
-                        {(new Date(post.frontmatter.date) > new Date() ||
-                          post.frontmatter.public === false) && (
-                            <span className="px-1.5 py-0.5 border border-current rounded-sm text-[9px] md:text-xs">
-                              Draft
-                            </span>
-                          )}
+                        </time>
                       </div>
-                      <h3 className="text-lg md:text-2xl font-bold text-primary mb-3 md:mb-6 group-hover:text-accent-dark transition-colors line-clamp-3 md:line-clamp-4 leading-tight">
+
+                      <h3 className="text-xl md:text-3xl font-bold text-white mb-4 group-hover:text-accent transition-colors drop-shadow-md leading-tight max-w-4xl">
                         {post.frontmatter.title}
                       </h3>
-                      <p className="text-text-secondary text-sm md:text-lg line-clamp-3 md:line-clamp-4 mb-4 md:mb-8 leading-relaxed">
-                        {post.frontmatter.excerpt}
-                      </p>
-                      <div className="mt-auto pt-4 md:pt-8 border-t border-neutral-medium flex items-center justify-between">
-                        <span className="text-saturated text-sm md:text-base font-extrabold group-hover:text-accent-dark transition-colors">
+
+                      {post.frontmatter.excerpt && (
+                        <p className="text-white/90 text-sm md:text-lg line-clamp-3 mb-6 max-w-4xl drop-shadow-sm leading-relaxed">
+                          {post.frontmatter.excerpt}
+                        </p>
+                      )}
+
+                      <div className="mt-auto flex items-center justify-between border-t border-white/20 pt-6">
+                        <span className="text-accent text-sm md:text-base font-extrabold group-hover:text-white transition-colors">
                           {t('readMore')}
                         </span>
-                        <div className="w-8 h-8 md:w-10 md:h-10 rounded-full bg-primary-light flex items-center justify-center text-saturated group-hover:bg-accent group-hover:text-primary-dark transition-all duration-300">
+                        <div className="w-10 h-10 rounded-full bg-white/10 flex items-center justify-center text-accent group-hover:bg-accent group-hover:text-primary-dark transition-all duration-300 backdrop-blur-sm border border-white/20">
                           <svg
-                            className="w-4 h-4 md:w-5 md:h-5 transition-transform group-hover:translate-x-1"
+                            className="w-5 h-5 transition-transform group-hover:translate-x-1"
                             fill="none"
                             stroke="currentColor"
                             viewBox="0 0 24 24"
diff --git a/app/[locale]/contact/page.tsx b/app/[locale]/contact/page.tsx
index 9994b8e5..f3b356c8 100644
--- a/app/[locale]/contact/page.tsx
+++ b/app/[locale]/contact/page.tsx
@@ -59,6 +59,21 @@ export default async function ContactPage({ params }: ContactPageProps) {
   const { locale } = await params;
   setRequestLocale(locale);
   const t = await getTranslations({ locale, namespace: 'Contact' });
+
+  // Get translated slug to redirect if user used incorrect static slug
+  const { headers } = await import('next/headers');
+  const headersList = await headers();
+  const urlPath = headersList.get('x-invoke-path') || '';
+  const currentSlug = urlPath.split('/').pop();
+
+  if (currentSlug) {
+    const contactSlugDe = locale === 'de' ? 'kontakt' : 'contact';
+    if (currentSlug !== contactSlugDe && (currentSlug === 'kontakt' || currentSlug === 'contact')) {
+      const { redirect } = await import('next/navigation');
+      redirect(`/${locale}/${contactSlugDe}`);
+    }
+  }
+
   return (
     <div className="flex flex-col min-h-screen bg-neutral-light">
       <JsonLd
diff --git a/app/[locale]/not-found.tsx b/app/[locale]/not-found.tsx
index ca353691..c153adcb 100644
--- a/app/[locale]/not-found.tsx
+++ b/app/[locale]/not-found.tsx
@@ -1,66 +1,137 @@
-'use client';
-import { useTranslations } from 'next-intl';
+import { getTranslations } from 'next-intl/server';
 import { Container, Button, Heading } from '@/components/ui';
 import Scribble from '@/components/Scribble';
-import { useEffect } from 'react';
-import { useAnalytics } from '@/components/analytics/useAnalytics';
-import { AnalyticsEvents } from '@/components/analytics/analytics-events';
+import { getPayload } from 'payload';
+import configPromise from '@payload-config';
+import { headers } from 'next/headers';
+import ClientNotFoundTracker from '@/components/analytics/ClientNotFoundTracker';
 
-export default function NotFound() {
-  const t = useTranslations('Error.notFound');
-  const { trackEvent } = useAnalytics();
+export default async function NotFound() {
+  const t = await getTranslations('Error.notFound');
 
-  useEffect(() => {
-    const errorUrl = typeof window !== 'undefined' ? window.location.pathname : 'unknown';
-    trackEvent(AnalyticsEvents.ERROR, {
-      type: '404_not_found',
-      path: errorUrl,
-    });
+  // Try to determine the requested path
+  const headersList = await headers();
+  const urlPath = headersList.get('x-invoke-path') || '';
 
-    // Explicitly send the 404 to Sentry so we have visibility into broken links
-    import('@sentry/nextjs').then((Sentry) => {
-      Sentry.withScope((scope) => {
-        scope.setTag('status_code', '404');
-        scope.setTag('path', errorUrl);
-        Sentry.captureMessage(`Route Not Found: ${errorUrl}`, 'warning');
-      });
-    });
-  }, [trackEvent]);
+  let suggestedUrl = null;
+  let suggestedLang = null;
+
+  // If we have a path, try to see if the last segment (slug) exists in ANY locale
+  if (urlPath) {
+    const slug = urlPath.split('/').filter(Boolean).pop();
+    if (slug) {
+      try {
+        const payload = await getPayload({ config: configPromise });
+
+        // Check posts
+        const postRes = await payload.find({
+          collection: 'posts',
+          where: { slug: { equals: slug } },
+          locale: 'all',
+          limit: 1,
+        });
+
+        // Check products
+        const productRes =
+          postRes.docs.length === 0
+            ? await payload.find({
+                collection: 'products',
+                where: { slug: { equals: slug } },
+                locale: 'all',
+                limit: 1,
+              })
+            : { docs: [] };
+
+        // Check pages
+        const pageRes =
+          postRes.docs.length === 0 && productRes.docs.length === 0
+            ? await payload.find({
+                collection: 'pages',
+                where: { slug: { equals: slug } },
+                locale: 'all',
+                limit: 1,
+              })
+            : { docs: [] };
+
+        const anyDoc = postRes.docs[0] || productRes.docs[0] || pageRes.docs[0];
+
+        if (anyDoc) {
+          // If the doc exists, we can figure out its native locale or
+          // offer the alternative locale (if we are in 'de', offer 'en')
+          const currentLocale = urlPath.startsWith('/en') ? 'en' : 'de';
+          const alternativeLocale = currentLocale === 'de' ? 'en' : 'de';
+
+          suggestedLang = alternativeLocale === 'de' ? 'Deutsch' : 'English';
+
+          // Reconstruct the URL for the alternative locale
+          const pathParts = urlPath.split('/').filter(Boolean);
+          if (pathParts.length > 0 && (pathParts[0] === 'en' || pathParts[0] === 'de')) {
+            pathParts[0] = alternativeLocale;
+          } else {
+            pathParts.unshift(alternativeLocale);
+          }
+          suggestedUrl = '/' + pathParts.join('/');
+        }
+      } catch (e) {
+        // Ignore Payload errors in 404
+      }
+    }
+  }
 
   return (
-    <Container className="relative py-24 flex flex-col items-center justify-center text-center min-h-[70vh] overflow-hidden">
-      {/* Industrial Background Element */}
-      <div className="absolute inset-0 -z-10 opacity-[0.03] pointer-events-none flex items-center justify-center">
-        <span className="text-[20rem] font-bold select-none">404</span>
-      </div>
+    <>
+      <ClientNotFoundTracker path={urlPath} />
+      <Container className="relative py-24 flex flex-col items-center justify-center text-center min-h-[70vh] overflow-hidden">
+        {/* Industrial Background Element */}
+        <div className="absolute inset-0 -z-10 opacity-[0.03] pointer-events-none flex items-center justify-center">
+          <span className="text-[20rem] font-bold select-none">404</span>
+        </div>
 
-      <div className="relative mb-8">
-        <Heading level={1} className="text-6xl md:text-8xl font-bold mb-2">
-          404
+        <div className="relative mb-8">
+          <Heading level={1} className="text-6xl md:text-8xl font-bold mb-2">
+            404
+          </Heading>
+          <Scribble
+            variant="circle"
+            className="w-[150%] h-[150%] -top-[25%] -left-[25%] text-accent/40"
+          />
+        </div>
+
+        <Heading level={2} className="text-2xl md:text-3xl font-bold mb-4 text-primary">
+          {t('title')}
         </Heading>
-        <Scribble
-          variant="circle"
-          className="w-[150%] h-[150%] -top-[25%] -left-[25%] text-accent/40"
-        />
-      </div>
 
-      <Heading level={2} className="text-2xl md:text-3xl font-bold mb-4 text-primary">
-        {t('title')}
-      </Heading>
+        <p className="text-text-secondary mb-10 max-w-md text-lg">{t('description')}</p>
 
-      <p className="text-white/60 mb-10 max-w-md text-lg">{t('description')}</p>
+        {suggestedUrl && (
+          <div className="mb-12 p-6 bg-accent/10 border border-accent/20 rounded-2xl animate-fade-in shadow-lg relative overflow-hidden group">
+            <div className="absolute inset-0 bg-accent/5 -skew-x-12 translate-x-full group-hover:translate-x-0 transition-transform duration-700" />
+            <div className="relative z-10">
+              <h3 className="text-primary font-bold mb-2 text-lg">
+                Did you mean to visit the {suggestedLang} version?
+              </h3>
+              <p className="text-text-secondary text-sm mb-4">
+                This page exists, but in another language.
+              </p>
+              <Button href={suggestedUrl} variant="accent" size="md" className="w-full sm:w-auto">
+                Go to {suggestedLang} Version
+              </Button>
+            </div>
+          </div>
+        )}
 
-      <div className="flex flex-col sm:flex-row gap-4">
-        <Button href="/" variant="accent" size="lg">
-          {t('cta')}
-        </Button>
-        <Button href="/contact" variant="outline" size="lg">
-          Contact Support
-        </Button>
-      </div>
+        <div className="flex flex-col sm:flex-row gap-4">
+          <Button href="/" variant={suggestedUrl ? 'outline' : 'accent'} size="lg">
+            {t('cta')}
+          </Button>
+          <Button href="/contact" variant={suggestedUrl ? 'ghost' : 'outline'} size="lg">
+            Contact Support
+          </Button>
+        </div>
 
-      {/* Decorative Industrial Line */}
-      <div className="absolute bottom-0 left-1/2 -translate-x-1/2 w-px h-24 bg-gradient-to-t from-accent/50 to-transparent" />
-    </Container>
+        {/* Decorative Industrial Line */}
+        <div className="absolute bottom-0 left-1/2 -translate-x-1/2 w-px h-24 bg-gradient-to-t from-accent/50 to-transparent" />
+      </Container>
+    </>
   );
 }
diff --git a/app/[locale]/products/[...slug]/page.tsx b/app/[locale]/products/[...slug]/page.tsx
index fe376ea9..d42d6a3d 100644
--- a/app/[locale]/products/[...slug]/page.tsx
+++ b/app/[locale]/products/[...slug]/page.tsx
@@ -14,7 +14,7 @@ import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { getProductOGImageMetadata } from '@/lib/metadata';
 import Image from 'next/image';
 import Link from 'next/link';
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import ProductEngagementTracker from '@/components/analytics/ProductEngagementTracker';
 import PayloadRichText from '@/components/PayloadRichText';
 
@@ -53,7 +53,7 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
       title: categoryTitle,
       description: categoryDesc,
       alternates: {
-        canonical: `${SITE_URL}/${locale}/${await mapFileSlugToTranslated('products', locale)}/${productSlug}`,
+        canonical: `${SITE_URL}/${locale}/${await mapFileSlugToTranslated('products', locale)}/${await mapFileSlugToTranslated(fileSlug, locale)}`,
         languages: {
           de: `${SITE_URL}/de/${await mapFileSlugToTranslated('products', 'de')}/${await mapFileSlugToTranslated(fileSlug, 'de')}`,
           en: `${SITE_URL}/en/${await mapFileSlugToTranslated('products', 'en')}/${await mapFileSlugToTranslated(fileSlug, 'en')}`,
@@ -75,11 +75,13 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
   const product = await getProductBySlug(productSlug, locale);
   if (!product) return {};
 
+  const currentLocalePath = await getLocalizedPath(locale);
+
   return {
     title: product.frontmatter.title,
     description: product.frontmatter.description,
     alternates: {
-      canonical: `${SITE_URL}/${locale}/${await mapFileSlugToTranslated('products', locale)}/${slug.join('/')}`,
+      canonical: `${SITE_URL}/${locale}/${currentLocalePath}`,
       languages: {
         de: `${SITE_URL}/de/${await getLocalizedPath('de')}`,
         en: `${SITE_URL}/en/${await getLocalizedPath('en')}`,
@@ -90,7 +92,7 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
       title: product.frontmatter.title,
       description: product.frontmatter.description,
       type: 'website',
-      url: `${SITE_URL}/${locale}/products/${slug.join('/')}`,
+      url: `${SITE_URL}/${locale}/${currentLocalePath}`,
       images: getProductOGImageMetadata(productSlug, product.frontmatter.title, locale),
     },
     twitter: {
@@ -114,7 +116,19 @@ export default async function ProductPage({ params }: ProductPageProps) {
     'high-voltage-cables',
     'solar-cables',
   ];
-  const fileSlug = await mapSlugToFileSlug(productSlug, locale);
+
+  const fileSlugs = await Promise.all(slug.map((s) => mapSlugToFileSlug(s, locale)));
+  const translatedSlugsForLocale = await Promise.all(
+    fileSlugs.map((fs) => mapFileSlugToTranslated(fs, locale)),
+  );
+
+  // If the requested slugs don't exactly match the translated slugs for the current locale
+  // (i.e. if the user used the static language switcher but kept the original locale's slugs)
+  if (slug.join('/') !== translatedSlugsForLocale.join('/')) {
+    redirect(`/${locale}/${productsSlug}/${translatedSlugsForLocale.join('/')}`);
+  }
+
+  const fileSlug = fileSlugs[fileSlugs.length - 1];
 
   if (categories.includes(fileSlug)) {
     const allProducts = await getAllProducts(locale);
@@ -125,11 +139,26 @@ export default async function ProductPage({ params }: ProductPageProps) {
       ? t(`categories.${categoryKey}.title`)
       : fileSlug;
 
-    const filteredProducts = allProducts.filter((p) =>
-      p.frontmatter.categories.some(
-        (cat) => cat.toLowerCase().replace(/\s+/g, '-') === fileSlug || cat === categoryTitle,
-      ),
-    );
+    const filteredProducts = allProducts.filter((p) => {
+      const firstCat = p.frontmatter.categories[0] || '';
+      const normalizedCat = firstCat.toLowerCase().replace(/\s+/g, '-');
+      let pFileSlug = 'low-voltage-cables';
+      if (normalizedCat === 'hochspannungskabel' || normalizedCat === 'high-voltage-cables')
+        pFileSlug = 'high-voltage-cables';
+      else if (
+        normalizedCat === 'mittelspannungskabel' ||
+        normalizedCat === 'medium-voltage-cables'
+      )
+        pFileSlug = 'medium-voltage-cables';
+      else if (
+        normalizedCat === 'solarkabel' ||
+        normalizedCat === 'solar-cables' ||
+        normalizedCat === 'solar'
+      )
+        pFileSlug = 'solar-cables';
+
+      return pFileSlug === fileSlug;
+    });
 
     const productsWithTranslatedSlugs = await Promise.all(
       filteredProducts.map(async (p) => ({
diff --git a/app/api/health/cms/route.ts b/app/api/health/cms/route.ts
index af30e2e0..9b233273 100644
--- a/app/api/health/cms/route.ts
+++ b/app/api/health/cms/route.ts
@@ -1,9 +1,41 @@
 import { NextResponse } from 'next/server';
+import { getPayload } from 'payload';
+import configPromise from '@payload-config';
 
 export const dynamic = 'force-dynamic';
 
+/**
+ * Deep CMS Health Check
+ * Validates that Payload CMS can actually query the database.
+ * Used by post-deploy smoke tests to catch migration/schema issues.
+ */
 export async function GET() {
-  // Payload is embedded within the Next.js app, so if this route responds, the CMS is up.
-  // Further DB health checks can be implemented via Payload Local API later.
-  return NextResponse.json({ status: 'ok', message: 'Payload CMS is embedded.' }, { status: 200 });
+  const checks: Record<string, string> = {};
+
+  try {
+    const payload = await getPayload({ config: configPromise });
+    checks.init = 'ok';
+
+    // Verify each collection can be queried (catches missing locale tables, broken migrations)
+    const collections = ['posts', 'products', 'pages', 'media'] as const;
+    for (const collection of collections) {
+      try {
+        await payload.find({ collection, limit: 1, locale: 'en' });
+        checks[collection] = 'ok';
+      } catch (e: any) {
+        checks[collection] = `error: ${e.message?.substring(0, 100)}`;
+      }
+    }
+
+    const hasErrors = Object.values(checks).some((v) => v.startsWith('error'));
+    return NextResponse.json(
+      { status: hasErrors ? 'degraded' : 'ok', checks },
+      { status: hasErrors ? 503 : 200 },
+    );
+  } catch (e: any) {
+    return NextResponse.json(
+      { status: 'error', message: e.message?.substring(0, 200), checks },
+      { status: 503 },
+    );
+  }
 }
diff --git a/app/sitemap.ts b/app/sitemap.ts
index 97d1fc1b..40750c01 100644
--- a/app/sitemap.ts
+++ b/app/sitemap.ts
@@ -58,9 +58,24 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
     for (const product of productsMetadata) {
       if (!product.frontmatter || !product.slug) continue;
 
-      const category =
-        product.frontmatter.categories[0]?.toLowerCase().replace(/\s+/g, '-') || 'other';
-      const translatedCategory = await mapFileSlugToTranslated(category, locale);
+      const firstCat = product.frontmatter.categories[0] || '';
+      const normalizedCat = firstCat.toLowerCase().replace(/\s+/g, '-');
+      let categoryFileSlug = 'low-voltage-cables';
+      if (normalizedCat === 'hochspannungskabel' || normalizedCat === 'high-voltage-cables')
+        categoryFileSlug = 'high-voltage-cables';
+      else if (
+        normalizedCat === 'mittelspannungskabel' ||
+        normalizedCat === 'medium-voltage-cables'
+      )
+        categoryFileSlug = 'medium-voltage-cables';
+      else if (
+        normalizedCat === 'solarkabel' ||
+        normalizedCat === 'solar-cables' ||
+        normalizedCat === 'solar'
+      )
+        categoryFileSlug = 'solar-cables';
+
+      const translatedCategory = await mapFileSlugToTranslated(categoryFileSlug, locale);
       const translatedSlug = await mapFileSlugToTranslated(product.slug, locale);
 
       sitemapEntries.push({
diff --git a/components/PayloadRichText.tsx b/components/PayloadRichText.tsx
index 52e1fdd3..a8c471ef 100644
--- a/components/PayloadRichText.tsx
+++ b/components/PayloadRichText.tsx
@@ -49,11 +49,11 @@ const jsxConverters: JSXConverters = {
       const startsWithDash = text.trimStart().startsWith('- ');
       const prefix = startsWithDash ? null : parts.shift();
       return (
-        <>
+        <div className="my-4">
           {prefix && (
-            <span dangerouslySetInnerHTML={prefix.includes('<') ? { __html: prefix } : undefined}>
+            <div dangerouslySetInnerHTML={prefix.includes('<') ? { __html: prefix } : undefined}>
               {!prefix.includes('<') ? prefix : undefined}
-            </span>
+            </div>
           )}
           <ul className="list-disc pl-6 my-4 space-y-2">
             {parts.map((item: string, i: number) => {
@@ -64,7 +64,7 @@ const jsxConverters: JSXConverters = {
               return <li key={i}>{cleanItem}</li>;
             })}
           </ul>
-        </>
+        </div>
       );
     }
 
@@ -118,14 +118,92 @@ const jsxConverters: JSXConverters = {
       );
     }
 
-    if (node.format === 1) return <strong>{text}</strong>;
-    if (node.format === 2) return <em>{text}</em>;
-    return <span>{text}</span>;
+    if (node.format === 1) return <strong key="bold">{text}</strong>;
+    if (node.format === 2) return <em key="italic">{text}</em>;
+    return <span key="text">{text}</span>;
+  },
+  // Use div instead of p for paragraphs to allow nested block elements (like the lists above)
+  paragraph: ({ children }: any) => (
+    <div className="mb-6 leading-relaxed text-text-secondary">{children}</div>
+  ),
+  // Scale headings to prevent multiple H1s (H1 -> H2, etc) and style natively
+  heading: ({ node, children }: any) => {
+    const tag = node?.tag;
+    if (tag === 'h1')
+      return (
+        <h2 className="text-3xl md:text-4xl font-bold mt-12 mb-6 text-text-primary">{children}</h2>
+      );
+    if (tag === 'h2')
+      return (
+        <h3 className="text-2xl md:text-3xl font-bold mt-10 mb-5 text-text-primary">{children}</h3>
+      );
+    if (tag === 'h3')
+      return (
+        <h4 className="text-xl md:text-2xl font-bold mt-8 mb-4 text-text-primary">{children}</h4>
+      );
+    if (tag === 'h4')
+      return (
+        <h5 className="text-lg md:text-xl font-bold mt-6 mb-4 text-text-primary">{children}</h5>
+      );
+    if (tag === 'h5')
+      return (
+        <h6 className="text-base md:text-lg font-bold mt-6 mb-4 text-text-primary">{children}</h6>
+      );
+    return <h6 className="text-base font-bold mt-6 mb-4 text-text-primary">{children}</h6>;
+  },
+  list: ({ node, children }: any) => {
+    if (node?.listType === 'number') {
+      return (
+        <ol className="list-decimal pl-6 my-6 space-y-2 text-text-secondary marker:text-primary marker:font-bold">
+          {children}
+        </ol>
+      );
+    }
+    if (node?.listType === 'check') {
+      return <ul className="list-none pl-0 my-6 space-y-2 text-text-secondary">{children}</ul>;
+    }
+    return (
+      <ul className="list-disc pl-6 my-6 space-y-2 text-text-secondary marker:text-primary">
+        {children}
+      </ul>
+    );
+  },
+  listitem: ({ node, children }: any) => {
+    if (node?.checked != null) {
+      return (
+        <li className="flex items-center gap-3 mb-2 leading-relaxed">
+          <input
+            type="checkbox"
+            checked={node.checked}
+            readOnly
+            className="mt-1 w-4 h-4 text-primary focus:ring-primary border-gray-300 rounded"
+          />
+          <span>{children}</span>
+        </li>
+      );
+    }
+    return <li className="mb-2 leading-relaxed">{children}</li>;
+  },
+  quote: ({ children }: any) => (
+    <blockquote className="border-l-4 border-primary bg-primary/5 rounded-r-2xl pl-6 py-4 my-8 italic text-text-secondary shadow-sm">
+      {children}
+    </blockquote>
+  ),
+  link: ({ node, children }: any) => {
+    // Handling Payload CMS link nodes
+    const href = node?.fields?.url || node?.url || '#';
+    const newTab = node?.fields?.newTab || node?.newTab;
+    return (
+      <a
+        href={href}
+        target={newTab ? '_blank' : undefined}
+        rel={newTab ? 'noopener noreferrer' : undefined}
+        className="text-primary no-underline hover:underline font-medium transition-colors"
+      >
+        {children}
+      </a>
+    );
   },
-  // Scale headings to prevent multiple H1s (H1 -> H2, etc)
-  h1: ({ children }: any) => <h2 className="text-3xl md:text-4xl font-bold my-6">{children}</h2>,
-  h2: ({ children }: any) => <h3 className="text-2xl md:text-3xl font-bold my-5">{children}</h3>,
-  h3: ({ children }: any) => <h4 className="text-xl md:text-2xl font-bold my-4">{children}</h4>,
 
   blocks: {
     // ... preserved existing blocks ...
@@ -170,10 +248,10 @@ const jsxConverters: JSXConverters = {
       />
     ),
     technicalGrid: ({ node }: any) => (
-      <TechnicalGrid title={node.fields.title} items={node.fields.items} />
+      <TechnicalGrid title={node?.fields?.title} items={node?.fields?.items} />
     ),
     'block-technicalGrid': ({ node }: any) => {
-      console.log('[PayloadRichText] Rendering block-technicalGrid:', node.fields.title);
+      if (!node?.fields) return null;
       return <TechnicalGrid title={node.fields.title} items={node.fields.items} />;
     },
     highlightBox: ({ node }: any) => (
@@ -246,20 +324,23 @@ const jsxConverters: JSXConverters = {
         {node.fields.title}
       </SplitHeading>
     ),
-    productTabs: ({ node }: any) => (
-      <ProductTabs
-        technicalData={
-          <ProductTechnicalData
-            data={{
-              technicalItems: node.fields.technicalItems,
-              voltageTables: node.fields.voltageTables,
-            }}
-          />
-        }
-      >
-        <></>
-      </ProductTabs>
-    ),
+    productTabs: ({ node }: any) => {
+      if (!node?.fields) return null;
+      return (
+        <ProductTabs
+          technicalData={
+            <ProductTechnicalData
+              data={{
+                technicalItems: node.fields.technicalItems,
+                voltageTables: node.fields.voltageTables,
+              }}
+            />
+          }
+        >
+          <></>
+        </ProductTabs>
+      );
+    },
     'block-productTabs': ({ node }: any) => (
       <ProductTabs
         technicalData={
diff --git a/components/RelatedProducts.tsx b/components/RelatedProducts.tsx
index f6591665..808dcd72 100644
--- a/components/RelatedProducts.tsx
+++ b/components/RelatedProducts.tsx
@@ -41,10 +41,8 @@ export default async function RelatedProducts({
       ];
       const catFileSlug =
         categorySlugs.find((slug) => {
-          const key = slug.replace(/-cables$/, '').replace(/-([a-z])/g, (g) => g[1].toUpperCase());
-          const title = t(`categories.${key}.title`);
           return product.frontmatter.categories.some(
-            (cat) => cat.toLowerCase().replace(/\s+/g, '-') === slug || cat === title,
+            (cat) => cat.toLowerCase().replace(/\s+/g, '-') === slug,
           );
         }) || 'low-voltage-cables';
 
diff --git a/components/analytics/ClientNotFoundTracker.tsx b/components/analytics/ClientNotFoundTracker.tsx
new file mode 100644
index 00000000..b5af55e9
--- /dev/null
+++ b/components/analytics/ClientNotFoundTracker.tsx
@@ -0,0 +1,26 @@
+'use client';
+
+import { useEffect } from 'react';
+import { useAnalytics } from './useAnalytics';
+import { AnalyticsEvents } from './analytics-events';
+
+export default function ClientNotFoundTracker({ path }: { path: string }) {
+  const { trackEvent } = useAnalytics();
+
+  useEffect(() => {
+    trackEvent(AnalyticsEvents.ERROR, {
+      type: '404_not_found',
+      path,
+    });
+
+    import('@sentry/nextjs').then((Sentry) => {
+      Sentry.withScope((scope) => {
+        scope.setTag('status_code', '404');
+        scope.setTag('path', path);
+        Sentry.captureMessage(`Route Not Found: ${path}`, 'warning');
+      });
+    });
+  }, [trackEvent, path]);
+
+  return null;
+}
diff --git a/components/home/Hero.tsx b/components/home/Hero.tsx
index 5f2c1ea4..07324fd5 100644
--- a/components/home/Hero.tsx
+++ b/components/home/Hero.tsx
@@ -37,12 +37,26 @@ export default function Hero({ data }: { data?: any }) {
                 className="text-center md:text-left mb-6 md:mb-8 md:max-w-none text-white text-4xl sm:text-5xl md:text-7xl font-extrabold [text-shadow:_-2px_-2px_0_#002b49,_2px_-2px_0_#002b49,_-2px_2px_0_#002b49,_2px_2px_0_#002b49,_-2px_0_0_#002b49,_2px_0_0_#002b49,_0_-2px_0_#002b49,_0_2px_0_#002b49]"
               >
                 {data?.title ? (
-                  <span dangerouslySetInnerHTML={{ __html: data.title.replace(/<green>/g, '<span class="relative inline-block"><span class="relative z-10 text-accent italic inline-block">').replace(/<\/green>/g, '</span><div class="w-[140%] h-[140%] -top-[20%] -left-[20%] text-accent/30 hidden md:block absolute -z-10 animate-in fade-in zoom-in-0 duration-1000 ease-out fill-mode-both" style="animation-delay: 500ms;"><Scribble variant="circle" /></div></span>') }} />
+                  <span
+                    dangerouslySetInnerHTML={{
+                      __html: data.title
+                        .replace(
+                          /<green>/g,
+                          '<span class="relative inline-block"><span class="relative z-10 text-accent italic inline-block">',
+                        )
+                        .replace(
+                          /<\/green>/g,
+                          '</span><div class="w-[140%] h-[140%] -top-[20%] -left-[20%] text-accent/30 hidden md:block absolute -z-10 animate-in fade-in zoom-in-0 duration-1000 ease-out fill-mode-both" style="animation-delay: 500ms;"><Scribble variant="circle" /></div></span>',
+                        ),
+                    }}
+                  />
                 ) : (
                   t.rich('title', {
                     green: (chunks) => (
                       <span className="relative inline-block">
-                        <span className="relative z-10 text-accent italic inline-block">{chunks}</span>
+                        <span className="relative z-10 text-accent italic inline-block">
+                          {chunks}
+                        </span>
                         <div
                           className="w-[140%] h-[140%] -top-[20%] -left-[20%] text-accent/30 hidden md:block absolute -z-10 animate-in fade-in zoom-in-0 duration-1000 ease-out fill-mode-both"
                           style={{ animationDelay: '500ms' }}
diff --git a/components/home/RecentPosts.tsx b/components/home/RecentPosts.tsx
index 34b3f3a9..0b66ef60 100644
--- a/components/home/RecentPosts.tsx
+++ b/components/home/RecentPosts.tsx
@@ -3,7 +3,7 @@ import Image from 'next/image';
 import Link from 'next/link';
 import { getAllPosts } from '@/lib/blog';
 import { getTranslations } from 'next-intl/server';
-import { Section, Container, Heading, Card, Badge } from '../../components/ui';
+import { Section, Container, Heading } from '../../components/ui';
 
 interface RecentPostsProps {
   locale: string;
@@ -13,7 +13,7 @@ interface RecentPostsProps {
 export default async function RecentPosts({ locale, data }: RecentPostsProps) {
   const t = await getTranslations('Blog');
   const posts = await getAllPosts(locale);
-  const recentPosts = posts.slice(0, 3);
+  const recentPosts = posts.slice(0, 4);
 
   if (recentPosts.length === 0) return null;
 
@@ -21,9 +21,9 @@ export default async function RecentPosts({ locale, data }: RecentPostsProps) {
   const subtitle = data?.subtitle || t('latestNews');
 
   return (
-    <Section className="bg-neutral py-16 md:py-24">
-      <Container>
-        <div className="flex flex-col md:flex-row items-start md:items-end justify-between mb-12 md:mb-16 gap-6">
+    <Section className="bg-neutral-light py-0 md:py-0 lg:py-0">
+      <Container className="py-12 md:py-16">
+        <div className="flex flex-col md:flex-row items-start md:items-end justify-between gap-6">
           <Heading level={2} subtitle={subtitle} className="mb-0 text-primary">
             {title}
           </Heading>
@@ -35,74 +35,73 @@ export default async function RecentPosts({ locale, data }: RecentPostsProps) {
             <span className="ml-2 transition-transform group-hover:translate-x-2">&rarr;</span>
           </Link>
         </div>
-
-        <ul className="grid grid-cols-1 md:grid-cols-3 gap-8 md:gap-10 list-none p-0 m-0">
-          {recentPosts.map((post, idx) => (
-            <li key={`${post.slug}-${idx}`}>
-              <Link href={`/${locale}/blog/${post.slug}`} className="group block h-full">
-                <Card
-                  tag="article"
-                  className="h-full flex flex-col border-none shadow-lg hover:shadow-2xl transition-all duration-500 rounded-3xl"
-                >
-                  {post.frontmatter.featuredImage && (
-                    <div className="relative h-64 overflow-hidden">
-                      <Image
-                        src={post.frontmatter.featuredImage.split('?')[0]}
-                        alt={post.frontmatter.title}
-                        fill
-                        className="w-full h-full object-cover transition-transform duration-700 group-hover:scale-110"
-                        style={{
-                          objectPosition: `${post.frontmatter.focalX ?? 50}% ${post.frontmatter.focalY ?? 50}%`,
-                        }}
-                        sizes="(max-width: 768px) 100vw, 33vw"
-                        loading="lazy"
-                      />
-                      <div className="absolute inset-0 image-overlay-gradient opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
-                      {post.frontmatter.category && (
-                        <Badge variant="accent" className="absolute top-4 left-4 shadow-md">
-                          {post.frontmatter.category}
-                        </Badge>
-                      )}
-                    </div>
-                  )}
-                  <div className="p-6 md:p-8 flex flex-col flex-grow">
-                    <div className="text-xs md:text-sm font-medium text-text-light mb-3 md:mb-4 flex items-center gap-2">
-                      <span className="w-6 md:w-8 h-px bg-neutral-medium" />
-                      <time dateTime={post.frontmatter.date}>
-                        {new Date(post.frontmatter.date).toLocaleDateString(locale, {
-                          year: 'numeric',
-                          month: 'long',
-                          day: 'numeric',
-                        })}
-                      </time>
-                    </div>
-                    <h3 className="text-lg md:text-xl font-bold text-primary group-hover:text-accent-dark transition-colors line-clamp-2 mb-4 md:mb-6 leading-tight">
-                      {post.frontmatter.title}
-                    </h3>
-                    <div className="mt-auto flex items-center text-primary font-bold group-hover:underline decoration-2 underline-offset-4">
-                      {t('readMore')}
-                      <svg
-                        className="ml-2 w-5 h-5 transition-transform group-hover:translate-x-2"
-                        fill="none"
-                        stroke="currentColor"
-                        viewBox="0 0 24 24"
-                        aria-hidden="true"
-                      >
-                        <path
-                          strokeLinecap="round"
-                          strokeLinejoin="round"
-                          strokeWidth={2}
-                          d="M17 8l4 4m0 0l-4 4m4-4H3"
-                        />
-                      </svg>
-                    </div>
-                  </div>
-                </Card>
-              </Link>
-            </li>
-          ))}
-        </ul>
       </Container>
+
+      <ul className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 m-0 p-0 list-none">
+        {recentPosts.map((post, idx) => (
+          <li key={`${post.slug}-${idx}`} className="block">
+            <Link
+              href={`/${locale}/blog/${post.slug}`}
+              className="group block relative h-[400px] md:h-[500px] lg:h-[650px] overflow-hidden border-b md:border-b-0 md:border-r border-white/10 last:border-0 focus:outline-none"
+            >
+              {post.frontmatter.featuredImage && (
+                <>
+                  <Image
+                    src={post.frontmatter.featuredImage.split('?')[0]}
+                    alt={post.frontmatter.title}
+                    fill
+                    className="object-cover transition-transform duration-1000 group-hover:scale-110"
+                    style={{
+                      objectPosition: `${post.frontmatter.focalX ?? 50}% ${post.frontmatter.focalY ?? 50}%`,
+                    }}
+                    sizes="(max-width: 768px) 100vw, (max-width: 1024px) 50vw, 25vw"
+                    loading="lazy"
+                  />
+                  <div className="absolute inset-0 bg-primary-dark/40 group-hover:bg-primary-dark/60 transition-all duration-500" />
+                </>
+              )}
+
+              <div className="absolute inset-0 p-8 md:p-10 flex flex-col justify-end text-white">
+                <div className="mb-4 md:mb-6 transform transition-all duration-500 group-hover:-translate-y-4">
+                  <div className="flex flex-wrap items-center gap-2 mb-4">
+                    {post.frontmatter.category && (
+                      <span className="px-3 py-1 bg-accent text-primary-dark rounded-full text-[10px] md:text-xs font-bold uppercase tracking-wider shadow-sm">
+                        {post.frontmatter.category}
+                      </span>
+                    )}
+                    <time
+                      dateTime={post.frontmatter.date}
+                      suppressHydrationWarning
+                      className="px-3 py-1 text-white/80 text-[10px] md:text-xs font-bold uppercase tracking-widest border border-white/20 rounded-full bg-white/10 backdrop-blur-md"
+                    >
+                      {new Date(post.frontmatter.date).toLocaleDateString(locale, {
+                        year: 'numeric',
+                        month: 'short',
+                        day: 'numeric',
+                      })}
+                    </time>
+                    {(new Date(post.frontmatter.date) > new Date() ||
+                      post.frontmatter.public === false) && (
+                      <span className="px-2 py-0.5 border border-white/40 text-white/90 rounded uppercase tracking-widest text-[10px] md:text-xs font-bold bg-neutral-dark/40 shadow-sm">
+                        Draft Preview
+                      </span>
+                    )}
+                  </div>
+                  <h3 className="text-xl md:text-2xl font-bold mb-2 md:mb-4 leading-tight drop-shadow-md">
+                    {post.frontmatter.title}
+                  </h3>
+                </div>
+                <div className="flex items-center text-accent font-bold tracking-wider uppercase text-xs md:text-xs opacity-100 md:opacity-0 group-hover:opacity-100 transition-all duration-500 delay-100">
+                  {t('readMore')}{' '}
+                  <span className="ml-2 transition-transform group-hover:translate-x-2">
+                    &rarr;
+                  </span>
+                </div>
+              </div>
+            </Link>
+          </li>
+        ))}
+      </ul>
     </Section>
   );
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 5a30cb3a..9a6a3c5f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
       - "traefik.http.routers.${PROJECT_NAME:-klz}.middlewares=${AUTH_MIDDLEWARE:-klz-ratelimit,klz-forward,klz-compress}"
 
       # Public Router – paths that bypass Gatekeeper auth (health, SEO, static assets, OG images)
-      - "traefik.http.routers.${PROJECT_NAME:-klz}-public.rule=(${TRAEFIK_HOST_RULE:-Host(`${TRAEFIK_HOST:-klz-cables.com}`)}) && PathRegexp(`^/(health|uploads|media|robots\\.txt|manifest\\.webmanifest|sitemap(-[0-9]+)?\\.xml|(.*/)?api/og(/.*)?|(.*/)?opengraph-image.*)`)"
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-public.rule=(${TRAEFIK_HOST_RULE:-Host(`${TRAEFIK_HOST:-klz-cables.com}`)}) && PathRegexp(`^/([a-z]{2}/)?(health|login|gatekeeper|uploads|media|robots\\.txt|manifest\\.webmanifest|sitemap(-[0-9]+)?\\.xml|(.*/)?api/og(/.*)?|(.*/)?opengraph-image.*)`)"
       - "traefik.http.routers.${PROJECT_NAME:-klz}-public.entrypoints=${TRAEFIK_ENTRYPOINT:-web}"
       - "traefik.http.routers.${PROJECT_NAME:-klz}-public.tls.certresolver=${TRAEFIK_CERT_RESOLVER:-}"
       - "traefik.http.routers.${PROJECT_NAME:-klz}-public.tls=${TRAEFIK_TLS:-false}"
@@ -46,9 +46,21 @@ services:
       - "traefik.http.middlewares.${PROJECT_NAME:-klz}-forward.headers.customrequestheaders.X-Forwarded-Proto=https"
       - "traefik.http.middlewares.${PROJECT_NAME:-klz}-forward.headers.customrequestheaders.X-Forwarded-Ssl=on"
 
+      # Login redirect – the app's middleware sends users to /login but login lives at /gatekeeper/login
+      - "traefik.http.middlewares.${PROJECT_NAME:-klz}-loginredirect.redirectregex.regex=^https?://[^/]+/([a-z]{2}/)?login(.*)"
+      - "traefik.http.middlewares.${PROJECT_NAME:-klz}-loginredirect.redirectregex.replacement=https://${TRAEFIK_HOST:-klz-cables.com}/gatekeeper/login$${2}"
+      - "traefik.http.middlewares.${PROJECT_NAME:-klz}-loginredirect.redirectregex.permanent=false"
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-loginredir.rule=(${TRAEFIK_HOST_RULE:-Host(`${TRAEFIK_HOST:-klz-cables.com}`)}) && PathRegexp(`^/([a-z]{2}/)?login`)"
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-loginredir.entrypoints=${TRAEFIK_ENTRYPOINT:-web}"
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-loginredir.tls.certresolver=${TRAEFIK_CERT_RESOLVER:-}"
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-loginredir.tls=${TRAEFIK_TLS:-false}"
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-loginredir.middlewares=${PROJECT_NAME:-klz}-loginredirect"
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-loginredir.service=${PROJECT_NAME:-klz}-app-svc"
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-loginredir.priority=2002"
+
   klz-gatekeeper:
     profiles: [ "gatekeeper" ]
-    image: registry.infra.mintel.me/mintel/gatekeeper:v1.7.12
+    image: registry.infra.mintel.me/mintel/gatekeeper:testing
     restart: unless-stopped
     networks:
       infra:
@@ -66,8 +78,8 @@ services:
       - "traefik.http.middlewares.${PROJECT_NAME:-klz}-auth.forwardauth.authResponseHeaders=X-Auth-User"
       - "traefik.docker.network=infra"
 
-      # Gatekeeper Public Router (Login/Auth UI)
-      - "traefik.http.routers.${PROJECT_NAME:-klz}-gatekeeper.rule=(${TRAEFIK_HOST_RULE:-Host(`${TRAEFIK_HOST:-klz-cables.com}`)}) && PathRegexp(`^/(login|gatekeeper)(/.*)?`)"
+      # Gatekeeper Public Router (Login/Auth UI) — basePath mode on main domain
+      - "traefik.http.routers.${PROJECT_NAME:-klz}-gatekeeper.rule=(${TRAEFIK_HOST_RULE:-Host(`${TRAEFIK_HOST:-klz-cables.com}`)}) && PathPrefix(`/gatekeeper`)"
       - "traefik.http.routers.${PROJECT_NAME:-klz}-gatekeeper.entrypoints=${TRAEFIK_ENTRYPOINT:-web}"
       - "traefik.http.routers.${PROJECT_NAME:-klz}-gatekeeper.tls.certresolver=${TRAEFIK_CERT_RESOLVER:-}"
       - "traefik.http.routers.${PROJECT_NAME:-klz}-gatekeeper.tls=${TRAEFIK_TLS:-false}"
diff --git a/lib/blog.ts b/lib/blog.ts
index 947fee0f..196efea3 100644
--- a/lib/blog.ts
+++ b/lib/blog.ts
@@ -59,18 +59,50 @@ export async function getPostBySlug(slug: string, locale: string): Promise<PostD
   try {
     const payload = await getPayload({ config: configPromise });
 
-    const isDev = process.env.NODE_ENV === 'development';
-    const { docs } = await payload.find({
+    // First try: Find in the requested locale
+    let { docs } = await payload.find({
       collection: 'posts',
       where: {
         slug: { equals: slug },
-        ...(!isDev ? { _status: { equals: 'published' } } : {}),
+        ...(!config.showDrafts ? { _status: { equals: 'published' } } : {}),
       },
       locale: locale as any,
-      draft: isDev,
+      draft: config.showDrafts,
       limit: 1,
     });
 
+    // Fallback: If not found, try searching across all locales.
+    // This happens when a user uses the static language switcher
+    // e.g. switching from /en/blog/en-slug to /de/blog/en-slug.
+    if (!docs || docs.length === 0) {
+      const { docs: crossLocaleDocs } = await payload.find({
+        collection: 'posts',
+        where: {
+          slug: { equals: slug },
+          ...(!config.showDrafts ? { _status: { equals: 'published' } } : {}),
+        },
+        locale: 'all',
+        draft: config.showDrafts,
+        limit: 1,
+      });
+
+      if (crossLocaleDocs && crossLocaleDocs.length > 0) {
+        // Fetch the found document again, but strictly in the requested locale
+        // so we get the correctly translated fields (like the localized slug)
+        const { docs: correctLocaleDocs } = await payload.find({
+          collection: 'posts',
+          where: {
+            id: { equals: crossLocaleDocs[0].id },
+          },
+          locale: locale as any,
+          draft: config.showDrafts,
+          limit: 1,
+        });
+
+        docs = correctLocaleDocs;
+      }
+    }
+
     if (!docs || docs.length === 0) return null;
 
     const doc = docs[0];
@@ -107,15 +139,14 @@ export async function getPostBySlug(slug: string, locale: string): Promise<PostD
 export async function getAllPosts(locale: string): Promise<PostData[]> {
   try {
     const payload = await getPayload({ config: configPromise });
-    const isDev = process.env.NODE_ENV === 'development';
     const { docs } = await payload.find({
       collection: 'posts',
       where: {
-        ...(!isDev ? { _status: { equals: 'published' } } : {}),
+        ...(!config.showDrafts ? { _status: { equals: 'published' } } : {}),
       },
       locale: locale as any,
       sort: '-date',
-      draft: isDev,
+      draft: config.showDrafts,
       limit: 100,
     });
 
diff --git a/lib/config.ts b/lib/config.ts
index f9d18f63..150b913a 100644
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -29,6 +29,7 @@ function createConfig() {
     isStaging: target === 'staging',
     isTesting: target === 'testing',
     isDevelopment: target === 'development',
+    showDrafts: target === 'development' || target === 'testing' || target === 'staging',
     feedbackEnabled: env.NEXT_PUBLIC_FEEDBACK_ENABLED,
     gatekeeperUrl: env.GATEKEEPER_URL,
 
@@ -116,6 +117,9 @@ export const config = {
   get isDevelopment() {
     return getConfig().isDevelopment;
   },
+  get showDrafts() {
+    return getConfig().showDrafts;
+  },
   get baseUrl() {
     return getConfig().baseUrl;
   },
diff --git a/lib/pages.ts b/lib/pages.ts
index 98d2eb10..f39667ad 100644
--- a/lib/pages.ts
+++ b/lib/pages.ts
@@ -1,5 +1,7 @@
 import { getPayload } from 'payload';
 import configPromise from '@payload-config';
+import { mapSlugToFileSlug } from './slugs';
+import { config } from '@/lib/config';
 
 export interface PageFrontmatter {
   title: string;
@@ -44,19 +46,81 @@ function mapDoc(doc: any): PageData {
 export async function getPageBySlug(slug: string, locale: string): Promise<PageData | null> {
   try {
     const payload = await getPayload({ config: configPromise });
+    const fileSlug = await mapSlugToFileSlug(slug, locale);
 
-    const result = await payload.find({
-      collection: 'pages' as any,
+    // Try finding exact match first
+    let result = await payload.find({
+      collection: 'pages',
       where: {
-        slug: { equals: slug },
+        and: [
+          { slug: { equals: fileSlug } },
+          ...(!config.showDrafts ? [{ _status: { equals: 'published' } }] : []),
+        ],
       },
       locale: locale as any,
+      depth: 1,
       limit: 1,
     });
 
-    const docs = result.docs as any[];
-    if (!docs || docs.length === 0) return null;
-    return mapDoc(docs[0]);
+    // Fallback: search ALL locales
+    if (result.docs.length === 0) {
+      const crossResult = await payload.find({
+        collection: 'pages',
+        where: {
+          and: [
+            { slug: { equals: fileSlug } },
+            ...(!config.showDrafts ? [{ _status: { equals: 'published' } }] : []),
+          ],
+        },
+        locale: 'all',
+        depth: 1,
+        limit: 1,
+      });
+
+      if (crossResult.docs.length > 0) {
+        // Fetch missing exact match by internal id
+        result = await payload.find({
+          collection: 'pages',
+          where: {
+            id: { equals: crossResult.docs[0].id },
+          },
+          locale: locale as any,
+          depth: 1,
+          limit: 1,
+        });
+      }
+    }
+
+    if (result.docs.length > 0) {
+      const doc = result.docs[0];
+
+      return {
+        slug: doc.slug,
+        frontmatter: {
+          title: doc.title,
+          excerpt: doc.excerpt || '',
+          featuredImage:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.sizes?.card?.url || doc.featuredImage.url
+              : null,
+          focalX:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.focalX
+              : 50,
+          focalY:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.focalY
+              : 50,
+          layout:
+            doc.layout === 'fullBleed' || doc.layout === 'default'
+              ? doc.layout
+              : ('default' as const),
+        },
+        content: doc.content,
+      };
+    }
+
+    return null;
   } catch (error) {
     console.error(`[Payload] getPageBySlug failed for ${slug}:`, error);
     return null;
diff --git a/lib/products.ts b/lib/products.ts
index 11e99e13..5b53080e 100644
--- a/lib/products.ts
+++ b/lib/products.ts
@@ -1,6 +1,7 @@
 import { getPayload } from 'payload';
 import configPromise from '@payload-config';
 import { mapSlugToFileSlug } from './slugs';
+import { config } from '@/lib/config';
 
 export interface ProductFrontmatter {
   title: string;
@@ -26,13 +27,12 @@ export async function getProductMetadata(
   const payload = await getPayload({ config: configPromise });
   const fileSlug = await mapSlugToFileSlug(slug, locale);
 
-  const isDev = process.env.NODE_ENV === 'development';
   const result = await payload.find({
     collection: 'products',
     where: {
       and: [
         { slug: { equals: fileSlug } },
-        ...(!isDev ? [{ _status: { equals: 'published' } }] : []),
+        ...(!config.showDrafts ? [{ _status: { equals: 'published' } }] : []),
       ],
     },
     locale: locale as any,
@@ -70,13 +70,12 @@ export async function getProductBySlug(slug: string, locale: string): Promise<Pr
     const payload = await getPayload({ config: configPromise });
     const fileSlug = await mapSlugToFileSlug(slug, locale);
 
-    const isDev = process.env.NODE_ENV === 'development';
     const result = await payload.find({
       collection: 'products',
       where: {
         and: [
           { slug: { equals: fileSlug } },
-          ...(!isDev ? [{ _status: { equals: 'published' } }] : []),
+          ...(!config.showDrafts ? [{ _status: { equals: 'published' } }] : []),
         ],
       },
       locale: locale as any,
@@ -127,11 +126,10 @@ export async function getProductBySlug(slug: string, locale: string): Promise<Pr
 export async function getAllProductSlugs(locale: string): Promise<string[]> {
   try {
     const payload = await getPayload({ config: configPromise });
-    const isDev = process.env.NODE_ENV === 'development';
     const result = await payload.find({
       collection: 'products',
       where: {
-        ...(!isDev ? { _status: { equals: 'published' } } : {}),
+        ...(!config.showDrafts ? { _status: { equals: 'published' } } : {}),
       },
       locale: locale as any,
       pagination: false,
@@ -157,11 +155,10 @@ export async function getAllProducts(locale: string): Promise<ProductData[]> {
       images: true,
     } as const;
 
-    const isDev = process.env.NODE_ENV === 'development';
     const result = await payload.find({
       collection: 'products',
       where: {
-        ...(!isDev ? { _status: { equals: 'published' } } : {}),
+        ...(!config.showDrafts ? { _status: { equals: 'published' } } : {}),
       },
       locale: locale as any,
       depth: 1,
diff --git a/proxy.ts b/middleware.ts
similarity index 93%
rename from proxy.ts
rename to middleware.ts
index 6fab20ea..2261faad 100644
--- a/proxy.ts
+++ b/middleware.ts
@@ -45,8 +45,10 @@ export default async function middleware(request: NextRequest) {
   if (internalHosts.includes(urlObj.hostname)) {
     const proto = headers.get('x-forwarded-proto') || 'https';
     // Prioritize x-forwarded-host (passed by Traefik) over the local Host header
-    const hostHeader =
-      headers.get('x-forwarded-host') || headers.get('host') || 'testing.klz-cables.com';
+    const fallbackHost = process.env.NEXT_PUBLIC_BASE_URL
+      ? new URL(process.env.NEXT_PUBLIC_BASE_URL).host
+      : 'klz-cables.com';
+    const hostHeader = headers.get('x-forwarded-host') || headers.get('host') || fallbackHost;
 
     urlObj.protocol = proto;
 
diff --git a/next.config.mjs b/next.config.mjs
index f9938ab1..dc5814df 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -13,9 +13,8 @@ const nextConfig = {
   },
   experimental: {
     optimizePackageImports: ['lucide-react', 'framer-motion', '@/components/ui'],
-    cpus: 1,
+    cpus: 3,
     workerThreads: false,
-    memoryBasedWorkersCount: true,
   },
   reactStrictMode: false,
   productionBrowserSourceMaps: false,
@@ -394,6 +393,7 @@ const nextConfig = {
   },
   images: {
     formats: ['image/webp'],
+    deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
     remotePatterns: [
       {
         protocol: 'https',
@@ -403,6 +403,14 @@ const nextConfig = {
         protocol: 'https',
         hostname: '*.klz-cables.com',
       },
+      {
+        protocol: 'http',
+        hostname: 'klz-cables.com',
+      },
+      {
+        protocol: 'http',
+        hostname: '*.klz-cables.com',
+      },
       {
         protocol: 'http',
         hostname: 'klz.localhost',
@@ -428,6 +436,31 @@ const nextConfig = {
           source: '/de/kontakt',
           destination: '/de/contact',
         },
+        // Safety rewrites for English locale using German slugs (legacy or content errors)
+        {
+          source: '/en/produkte',
+          destination: '/en/products',
+        },
+        {
+          source: '/en/produkte/:path*',
+          destination: '/en/products/:path*',
+        },
+        {
+          source: '/en/kontakt',
+          destination: '/en/contact',
+        },
+        {
+          source: '/en/impressum',
+          destination: '/en/legal-notice',
+        },
+        {
+          source: '/en/datenschutz',
+          destination: '/en/privacy-policy',
+        },
+        {
+          source: '/en/agbs',
+          destination: '/en/terms',
+        },
       ],
       afterFiles: [],
       fallback: [],
diff --git a/package.json b/package.json
index ac15d7aa..f2c017c1 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "packageManager": "pnpm@10.18.3",
   "dependencies": {
     "@ai-sdk/google": "^3.0.31",
-    "@mintel/mail": "1.8.3",
-    "@mintel/next-config": "1.8.3",
-    "@mintel/next-feedback": "1.8.10",
-    "@mintel/next-utils": "^1.7.15",
+    "@mintel/mail": "^1.8.21",
+    "@mintel/next-config": "^1.8.21",
+    "@mintel/next-feedback": "^1.8.21",
+    "@mintel/next-utils": "^1.8.21",
     "@payloadcms/db-postgres": "^3.77.0",
     "@payloadcms/email-nodemailer": "^3.77.0",
     "@payloadcms/next": "^3.77.0",
@@ -57,8 +57,8 @@
     "@commitlint/config-conventional": "^20.4.0",
     "@cspell/dict-de-de": "^4.1.2",
     "@lhci/cli": "^0.15.1",
-    "@mintel/eslint-config": "1.8.3",
-    "@mintel/tsconfig": "1.8.3",
+    "@mintel/eslint-config": "1.8.21",
+    "@mintel/tsconfig": "^1.8.21",
     "@next/bundle-analyzer": "^16.1.6",
     "@tailwindcss/cli": "^4.1.18",
     "@tailwindcss/postcss": "^4.1.18",
@@ -69,6 +69,7 @@
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     "@types/sharp": "^0.31.1",
+    "@types/three": "^0.183.1",
     "@vitejs/plugin-react": "^5.1.4",
     "@vitest/ui": "^4.0.16",
     "autoprefixer": "^10.4.23",
@@ -114,6 +115,8 @@
     "check:security": "tsx ./scripts/check-security.ts",
     "check:links": "bash ./scripts/check-links.sh",
     "check:assets": "tsx ./scripts/check-broken-assets.ts",
+    "check:forms": "tsx ./scripts/check-forms.ts",
+    "check:apis": "tsx ./scripts/check-apis.ts",
     "pdf:datasheets": "tsx ./scripts/generate-pdf-datasheets.ts",
     "pdf:datasheets:legacy": "tsx ./scripts/generate-pdf-datasheets-pdf-lib.ts",
     "cms:migrate": "payload migrate",
diff --git a/payload.config.ts b/payload.config.ts
index 5e73ac1d..289ba29c 100644
--- a/payload.config.ts
+++ b/payload.config.ts
@@ -45,9 +45,7 @@ export default buildConfig({
     },
     meta: {
       titleSuffix: ' – KLZ Cables',
-      icons: [
-        { rel: 'icon', type: 'image/x-icon', url: '/favicon.ico' },
-      ],
+      icons: [{ rel: 'icon', type: 'image/x-icon', url: '/favicon.ico' }],
     },
   },
   localization: {
@@ -80,18 +78,25 @@ export default buildConfig({
         `postgresql://${process.env.PAYLOAD_DB_USER || 'payload'}:${process.env.PAYLOAD_DB_PASSWORD || '120in09oenaoinsd9iaidon'}@127.0.0.1:54322/${process.env.PAYLOAD_DB_NAME || 'payload'}`,
     },
   }),
-  email: nodemailerAdapter({
-    defaultFromAddress: process.env.MAIL_FROM?.replace(/.*<|>.*/g, '') || 'postmaster@mg.mintel.me',
-    defaultFromName: process.env.MAIL_FROM?.split('<')[0]?.trim() || 'KLZ Cables',
-    transportOptions: {
-      host: process.env.MAIL_HOST || 'smtp.eu.mailgun.org',
-      port: Number(process.env.MAIL_PORT) || 587,
-      auth: {
-        user: process.env.MAIL_USERNAME,
-        pass: process.env.MAIL_PASSWORD,
-      },
-    },
-  }),
+  email: process.env.MAIL_HOST
+    ? nodemailerAdapter({
+        defaultFromAddress:
+          process.env.MAIL_FROM?.replace(/.*<|>.*/g, '') || 'postmaster@mg.mintel.me',
+        defaultFromName: process.env.MAIL_FROM?.split('<')[0]?.trim() || 'KLZ Cables',
+        transportOptions: {
+          host: process.env.MAIL_HOST || 'smtp.eu.mailgun.org',
+          port: Number(process.env.MAIL_PORT) || 587,
+          ...(process.env.MAIL_USERNAME
+            ? {
+                auth: {
+                  user: process.env.MAIL_USERNAME,
+                  pass: process.env.MAIL_PASSWORD,
+                },
+              }
+            : {}),
+        },
+      })
+    : undefined,
   sharp,
   plugins: [],
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cef71b2e..f5fad1c5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,17 +16,17 @@ importers:
         specifier: ^3.0.31
         version: 3.0.31(zod@3.25.76)
       '@mintel/mail':
-        specifier: 1.8.3
-        version: 1.8.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+        specifier: ^1.8.21
+        version: 1.8.21(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@mintel/next-config':
-        specifier: 1.8.3
-        version: 1.8.3(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.5.1(@opentelemetry/api@1.9.0))(@swc/helpers@0.5.18)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)(typescript@5.9.3)(webpack@5.105.0(esbuild@0.25.12))
+        specifier: ^1.8.21
+        version: 1.8.21(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.5.1(@opentelemetry/api@1.9.0))(@swc/helpers@0.5.18)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)(typescript@5.9.3)(webpack@5.105.0(esbuild@0.25.12))
       '@mintel/next-feedback':
-        specifier: 1.8.10
-        version: 1.8.10(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)
+        specifier: ^1.8.21
+        version: 1.8.21(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)
       '@mintel/next-utils':
-        specifier: ^1.7.15
-        version: 1.7.15(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@swc/helpers@0.5.18)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)(typescript@5.9.3)
+        specifier: ^1.8.21
+        version: 1.8.21(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@swc/helpers@0.5.18)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)(typescript@5.9.3)
       '@payloadcms/db-postgres':
         specifier: ^3.77.0
         version: 3.77.0(@opentelemetry/api@1.9.0)(payload@3.77.0(graphql@16.12.0)(typescript@5.9.3))
@@ -167,11 +167,11 @@ importers:
         specifier: ^0.15.1
         version: 0.15.1
       '@mintel/eslint-config':
-        specifier: 1.8.3
-        version: 1.8.3(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+        specifier: 1.8.21
+        version: 1.8.21(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       '@mintel/tsconfig':
-        specifier: 1.8.3
-        version: 1.8.3
+        specifier: ^1.8.21
+        version: 1.8.21
       '@next/bundle-analyzer':
         specifier: ^16.1.6
         version: 16.1.6
@@ -202,6 +202,9 @@ importers:
       '@types/sharp':
         specifier: ^0.31.1
         version: 0.31.1
+      '@types/three':
+        specifier: ^0.183.1
+        version: 0.183.1
       '@vitejs/plugin-react':
         specifier: ^5.1.4
         version: 5.1.4(vite@7.3.1(@types/node@22.19.10)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
@@ -755,6 +758,9 @@ packages:
   '@date-fns/tz@1.2.0':
     resolution: {integrity: sha512-LBrd7MiJZ9McsOgxqWX7AaxrDjcFVjWH/tIKJd7pnR7McaslGYOP1QmmiBXdJH/H/yLCT+rcQ7FaPBUxRGUtrg==}
 
+  '@dimforge/rapier3d-compat@0.12.0':
+    resolution: {integrity: sha512-uekIGetywIgopfD97oDL5PfeezkFpNhwlzlaEYNOA0N6ghdsOvh/HYjSMek5Q2O1PYvRSDFcqFVJl4r4ZBwOow==}
+
   '@directus/sdk@21.1.0':
     resolution: {integrity: sha512-Ig8zZAQDbc7QMIM54N+x71C04lni9MN9yalNAezjDjFdNknTJzupDY7V5cb+kOJL8GsqDE9Bg8xq8xCmkDVs5A==}
     engines: {node: '>=22'}
@@ -1327,10 +1333,18 @@ packages:
     resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@eslint/eslintrc@3.3.4':
+    resolution: {integrity: sha512-4h4MVF8pmBsncB60r0wSJiIeUKTSD4m7FmTFThG8RHlsg9ajqckLm9OraguFGZE4vVdpiI1Q4+hFnisopmG6gQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@eslint/js@9.39.2':
     resolution: {integrity: sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@eslint/js@9.39.3':
+    resolution: {integrity: sha512-1B1VkCq6FuUNlQvlBYb+1jDu/gV297TIs/OeiaSR9l1H27SVW55ONE1e1Vp16NqP683+xEGzxYtv4XCiDPaQiw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@eslint/object-schema@2.1.7':
     resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1714,29 +1728,29 @@ packages:
   '@medv/finder@4.0.2':
     resolution: {integrity: sha512-RraNY9SCcx4KZV0Dh6BEW6XEW2swkqYca74pkFFRw6hHItSHiy+O/xMnpbofjYbzXj0tSpBGthUF1hHTsr3vIQ==}
 
-  '@mintel/eslint-config@1.8.3':
-    resolution: {integrity: sha512-Alr0ofai74qhnrhZy2mpNSR4gcqD4DTQLHcHX3pZPpsqu1QfNjhHofU7dyHDx5/SpXoMXsI4hSaLpytKEMNHLg==}
+  '@mintel/eslint-config@1.8.21':
+    resolution: {integrity: sha512-PsPxQk3fsUGLwQCVvHaiNNt0WcjwU/eU9xMxEGGm4SCcPw/ED4UZbaCEYwR78lp9BBGAKSqTFMWBhXfY4PjU8g==}
 
-  '@mintel/mail@1.8.3':
-    resolution: {integrity: sha512-y6MD0Rkn66D6gbMH1/6HNpneCJHUkDxtW7mYnq/ftRZf27ZDuhYqJaQVfXTCXS80oaWTzygc33Lpqz4UpdavQw==}
+  '@mintel/mail@1.8.21':
+    resolution: {integrity: sha512-leZV9gINmxD4eVJ3Ij9KdrQoyib67NVHgL/93J7KcWSUWKbr2HVuKUBpiWImeeEZn3JO0f7JwRbVUzXPBRVeQA==}
     peerDependencies:
       react: ^19.0.0
       react-dom: ^19.0.0
 
-  '@mintel/next-config@1.8.3':
-    resolution: {integrity: sha512-2t0ql4FCOqzLc4ImE3D39us5YHeKq9ZHjmWyiz9cwtJm89zGSvB/mzCja2ydrYtTEfLwxpiVKzXrVuSKLjFlow==}
+  '@mintel/next-config@1.8.21':
+    resolution: {integrity: sha512-Nwnp32h+eAjZwY9YHXHo2eIWkGrNWAqF6vT8RvyeehU1uJtoajrEpBIQPAf5dWmWSWkIdPSu9vlzEUORu39pBA==}
 
-  '@mintel/next-feedback@1.8.10':
-    resolution: {integrity: sha512-GgCkcgvAibOXli0bfx2/PLJgzPC0sTM67Wddef2eDCiV2Lgy4hZjX9P+PSKP5dwPGooyk29muOtm0HKJlkAXqg==}
+  '@mintel/next-feedback@1.8.21':
+    resolution: {integrity: sha512-7WUpX/GMUBO+DYrnCm1Xb3mRQAaWDDaA1DgwavlV2m0lYiwqlPsLGafsBOY9MdGrTFxp2oFuz8lUK8/fkB2/SQ==}
     peerDependencies:
       react: ^19.0.0
       react-dom: ^19.0.0
 
-  '@mintel/next-utils@1.7.15':
-    resolution: {integrity: sha512-CqSe3eHamq9zLs+AJxGOPypTLchw/oZ3JcLkor007PcUDMTv/Lspfv5oCaXK2s0FeIOJaa2QwSGPDI1h5/3ZVw==}
+  '@mintel/next-utils@1.8.21':
+    resolution: {integrity: sha512-sr0yDtySGou+3DNvrqY6HWSHCiVIc8nnoRbckyPMSE21AGxk2aJineXGy9BO9tulSBdhStm2SgdC7McMFTszug==}
 
-  '@mintel/tsconfig@1.8.3':
-    resolution: {integrity: sha512-IOtxrTZfPZs4XU4Q068dSUtETFb2drf43mgmaF31j+PtltfPkC7pdJcEjXDg365bZ5EUrgTlt9pYlgGmfrCEVQ==}
+  '@mintel/tsconfig@1.8.21':
+    resolution: {integrity: sha512-V5sY+sZlUv7i5OTqoLph+k7s0hMOzE8G7kB1snFGVuhE71zc8ooi+0WDeP++lwJz3xlFLhQTv/iRznfBnYOCew==}
 
   '@monaco-editor/loader@1.7.0':
     resolution: {integrity: sha512-gIwR1HrJrrx+vfyOhYmCZ0/JcWqG5kbfG7+d3f/C1LXk2EvzAbHSg3MQ5lO2sMlo9izoAZ04shohfKLVT6crVA==}
@@ -3086,6 +3100,9 @@ packages:
   '@tootallnate/quickjs-emscripten@0.23.0':
     resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==}
 
+  '@tweenjs/tween.js@23.1.3':
+    resolution: {integrity: sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==}
+
   '@tybys/wasm-util@0.10.1':
     resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
 
@@ -3199,6 +3216,9 @@ packages:
   '@types/node@22.19.11':
     resolution: {integrity: sha512-BH7YwL6rA93ReqeQS1c4bsPpcfOmJasG+Fkr6Y59q83f9M1WcBRHR2vM+P9eOisYRcN3ujQoiZY8uk5W+1WL8w==}
 
+  '@types/node@22.19.13':
+    resolution: {integrity: sha512-akNQMv0wW5uyRpD2v2IEyRSZiR+BeGuoB6L310EgGObO44HSMNT8z1xzio28V8qOrgYaopIDNA18YgdXd+qTiw==}
+
   '@types/nodemailer@7.0.9':
     resolution: {integrity: sha512-vI8oF1M+8JvQhsId0Pc38BdUP2evenIIys7c7p+9OZXSPOH5c1dyINP1jT8xQ2xPuBUXmIC87s+91IZMDjH8Ow==}
 
@@ -3234,9 +3254,15 @@ packages:
   '@types/sharp@0.31.1':
     resolution: {integrity: sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==}
 
+  '@types/stats.js@0.17.4':
+    resolution: {integrity: sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==}
+
   '@types/tedious@4.0.14':
     resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==}
 
+  '@types/three@0.183.1':
+    resolution: {integrity: sha512-f2Pu5Hrepfgavttdye3PsH5RWyY/AvdZQwIVhrc4uNtvF7nOWJacQKcoVJn0S4f0yYbmAE6AR+ve7xDcuYtMGw==}
+
   '@types/trusted-types@2.0.7':
     resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
@@ -3252,6 +3278,9 @@ packages:
   '@types/uuid@10.0.0':
     resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
 
+  '@types/webxr@0.5.24':
+    resolution: {integrity: sha512-h8fgEd/DpoS9CBrjEQXR+dIDraopAEfu4wYVNY2tEPwk60stPWhvZMf4Foo5FakuQ7HFZoa8WceaWFervK2Ovg==}
+
   '@types/whatwg-mimetype@3.0.2':
     resolution: {integrity: sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==}
 
@@ -3261,63 +3290,63 @@ packages:
   '@types/yauzl@2.10.3':
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
 
-  '@typescript-eslint/eslint-plugin@8.55.0':
-    resolution: {integrity: sha512-1y/MVSz0NglV1ijHC8OT49mPJ4qhPYjiK08YUQVbIOyu+5k862LKUHFkpKHWu//zmr7hDR2rhwUm6gnCGNmGBQ==}
+  '@typescript-eslint/eslint-plugin@8.56.1':
+    resolution: {integrity: sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.55.0
-      eslint: ^8.57.0 || ^9.0.0
+      '@typescript-eslint/parser': ^8.56.1
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/parser@8.55.0':
-    resolution: {integrity: sha512-4z2nCSBfVIMnbuu8uinj+f0o4qOeggYJLbjpPHka3KH1om7e+H9yLKTYgksTaHcGco+NClhhY2vyO3HsMH1RGw==}
+  '@typescript-eslint/parser@8.56.1':
+    resolution: {integrity: sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/project-service@8.55.0':
-    resolution: {integrity: sha512-zRcVVPFUYWa3kNnjaZGXSu3xkKV1zXy8M4nO/pElzQhFweb7PPtluDLQtKArEOGmjXoRjnUZ29NjOiF0eCDkcQ==}
+  '@typescript-eslint/project-service@8.56.1':
+    resolution: {integrity: sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/scope-manager@8.55.0':
-    resolution: {integrity: sha512-fVu5Omrd3jeqeQLiB9f1YsuK/iHFOwb04bCtY4BSCLgjNbOD33ZdV6KyEqplHr+IlpgT0QTZ/iJ+wT7hvTx49Q==}
+  '@typescript-eslint/scope-manager@8.56.1':
+    resolution: {integrity: sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.55.0':
-    resolution: {integrity: sha512-1R9cXqY7RQd7WuqSN47PK9EDpgFUK3VqdmbYrvWJZYDd0cavROGn+74ktWBlmJ13NXUQKlZ/iAEQHI/V0kKe0Q==}
+  '@typescript-eslint/tsconfig-utils@8.56.1':
+    resolution: {integrity: sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/type-utils@8.55.0':
-    resolution: {integrity: sha512-x1iH2unH4qAt6I37I2CGlsNs+B9WGxurP2uyZLRz6UJoZWDBx9cJL1xVN/FiOmHEONEg6RIufdvyT0TEYIgC5g==}
+  '@typescript-eslint/type-utils@8.56.1':
+    resolution: {integrity: sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/types@8.55.0':
-    resolution: {integrity: sha512-ujT0Je8GI5BJWi+/mMoR0wxwVEQaxM+pi30xuMiJETlX80OPovb2p9E8ss87gnSVtYXtJoU9U1Cowcr6w2FE0w==}
+  '@typescript-eslint/types@8.56.1':
+    resolution: {integrity: sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.55.0':
-    resolution: {integrity: sha512-EwrH67bSWdx/3aRQhCoxDaHM+CrZjotc2UCCpEDVqfCE+7OjKAGWNY2HsCSTEVvWH2clYQK8pdeLp42EVs+xQw==}
+  '@typescript-eslint/typescript-estree@8.56.1':
+    resolution: {integrity: sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/utils@8.55.0':
-    resolution: {integrity: sha512-BqZEsnPGdYpgyEIkDC1BadNY8oMwckftxBT+C8W0g1iKPdeqKZBtTfnvcq0nf60u7MkjFO8RBvpRGZBPw4L2ow==}
+  '@typescript-eslint/utils@8.56.1':
+    resolution: {integrity: sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/visitor-keys@8.55.0':
-    resolution: {integrity: sha512-AxNRwEie8Nn4eFS1FzDMJWIISMGoXMb037sgCBJ3UR6o0fQTzr2tqN9WT+DkWJPhIdQCfV7T6D387566VtnCJA==}
+  '@typescript-eslint/visitor-keys@8.56.1':
+    resolution: {integrity: sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
@@ -3504,6 +3533,9 @@ packages:
   '@webassemblyjs/wast-printer@1.14.1':
     resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}
 
+  '@webgpu/types@0.1.69':
+    resolution: {integrity: sha512-RPmm6kgRbI8e98zSD3RVACvnuktIja5+yLgDAkTmxLr90BEwdTXRQWNLF3ETTTyH/8mKhznZuN5AveXYFEsMGQ==}
+
   '@xtuc/ieee754@1.2.0':
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
 
@@ -3594,6 +3626,9 @@ packages:
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
+  ajv@6.14.0:
+    resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
+
   ajv@8.17.1:
     resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
 
@@ -3772,6 +3807,10 @@ packages:
     resolution: {integrity: sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==}
     engines: {node: 20 || >=22}
 
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
+
   bare-events@2.8.2:
     resolution: {integrity: sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==}
     peerDependencies:
@@ -3861,6 +3900,10 @@ packages:
     resolution: {integrity: sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==}
     engines: {node: 20 || >=22}
 
+  brace-expansion@5.0.4:
+    resolution: {integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==}
+    engines: {node: 18 || 20 || >=22}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -4889,6 +4932,10 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   eslint@9.39.2:
     resolution: {integrity: sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6244,6 +6291,9 @@ packages:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
 
+  meshoptimizer@1.0.1:
+    resolution: {integrity: sha512-Vix+QlA1YYT3FwmBBZ+49cE5y/b+pRrcXKqGpS5ouh33d3lSp2PoTpCw19E0cKDFWalembrHnIaZetf27a+W2g==}
+
   metaviewport-parser@0.3.0:
     resolution: {integrity: sha512-EoYJ8xfjQ6kpe9VbVHvZTZHiOl4HL1Z18CrZ+qahvLXT7ZO4YTC2JMyt5FaUp9JJp6J4Ybb/z7IsCXZt86/QkQ==}
 
@@ -6364,6 +6414,10 @@ packages:
     resolution: {integrity: sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==}
     engines: {node: 18 || 20 || >=22}
 
+  minimatch@10.2.4:
+    resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==}
+    engines: {node: 18 || 20 || >=22}
+
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
@@ -6503,6 +6557,10 @@ packages:
   node-addon-api@7.1.1:
     resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
 
+  node-exports-info@1.6.0:
+    resolution: {integrity: sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==}
+    engines: {node: '>= 0.4'}
+
   node-fetch@2.7.0:
     resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
     engines: {node: 4.x || >=6.0.0}
@@ -7247,8 +7305,9 @@ packages:
     engines: {node: '>= 0.4'}
     hasBin: true
 
-  resolve@2.0.0-next.5:
-    resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
+  resolve@2.0.0-next.6:
+    resolution: {integrity: sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==}
+    engines: {node: '>= 0.4'}
     hasBin: true
 
   restore-cursor@2.0.0:
@@ -7980,11 +8039,11 @@ packages:
   typedarray-to-buffer@3.1.5:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
 
-  typescript-eslint@8.55.0:
-    resolution: {integrity: sha512-HE4wj+r5lmDVS9gdaN0/+iqNvPZwGfnJ5lZuz7s5vLlg9ODw0bIiiETaios9LvFI1U94/VBXGm3CB2Y5cNFMpw==}
+  typescript-eslint@8.56.1:
+    resolution: {integrity: sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
   typescript@5.9.3:
@@ -9009,6 +9068,8 @@ snapshots:
 
   '@date-fns/tz@1.2.0': {}
 
+  '@dimforge/rapier3d-compat@0.12.0': {}
+
   '@directus/sdk@21.1.0': {}
 
   '@discoveryjs/json-ext@0.5.7': {}
@@ -9398,8 +9459,24 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@eslint/eslintrc@3.3.4':
+    dependencies:
+      ajv: 6.14.0
+      debug: 4.4.3
+      espree: 10.4.0
+      globals: 14.0.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
+      js-yaml: 4.1.1
+      minimatch: 10.2.4
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
   '@eslint/js@9.39.2': {}
 
+  '@eslint/js@9.39.3': {}
+
   '@eslint/object-schema@2.1.7': {}
 
   '@eslint/plugin-kit@0.4.1':
@@ -9869,15 +9946,15 @@ snapshots:
 
   '@medv/finder@4.0.2': {}
 
-  '@mintel/eslint-config@1.8.3(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@mintel/eslint-config@1.8.21(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@eslint/eslintrc': 3.3.3
-      '@eslint/js': 9.39.2
+      '@eslint/eslintrc': 3.3.4
+      '@eslint/js': 9.39.3
       '@next/eslint-plugin-next': 16.1.6
-      eslint-config-next: 16.1.6(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      eslint-config-next: 16.1.6(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       eslint-plugin-react: 7.37.5(eslint@9.39.2(jiti@2.6.1))
       eslint-plugin-react-hooks: 7.0.1(eslint@9.39.2(jiti@2.6.1))
-      typescript-eslint: 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      typescript-eslint: 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
     transitivePeerDependencies:
       - '@typescript-eslint/parser'
       - eslint
@@ -9886,13 +9963,13 @@ snapshots:
       - supports-color
       - typescript
 
-  '@mintel/mail@1.8.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+  '@mintel/mail@1.8.21(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@react-email/components': 0.0.33(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
 
-  '@mintel/next-config@1.8.3(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.5.1(@opentelemetry/api@1.9.0))(@swc/helpers@0.5.18)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)(typescript@5.9.3)(webpack@5.105.0(esbuild@0.25.12))':
+  '@mintel/next-config@1.8.21(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.5.1(@opentelemetry/api@1.9.0))(@swc/helpers@0.5.18)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)(typescript@5.9.3)(webpack@5.105.0(esbuild@0.25.12))':
     dependencies:
       '@sentry/nextjs': 10.39.0(@opentelemetry/context-async-hooks@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@2.5.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.5.1(@opentelemetry/api@1.9.0))(next@16.1.6(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3))(react@19.2.4)(webpack@5.105.0(esbuild@0.25.12))
       next: 16.1.6(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)
@@ -9915,7 +9992,7 @@ snapshots:
       - typescript
       - webpack
 
-  '@mintel/next-feedback@1.8.10(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)':
+  '@mintel/next-feedback@1.8.21(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)':
     dependencies:
       '@directus/sdk': 21.1.0
       '@medv/finder': 4.0.2
@@ -9936,7 +10013,7 @@ snapshots:
       - babel-plugin-react-compiler
       - sass
 
-  '@mintel/next-utils@1.7.15(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@swc/helpers@0.5.18)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)(typescript@5.9.3)':
+  '@mintel/next-utils@1.8.21(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(@swc/helpers@0.5.18)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)(typescript@5.9.3)':
     dependencies:
       '@directus/sdk': 21.1.0
       next: 16.1.6(@babel/core@7.29.0)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3)
@@ -9954,7 +10031,7 @@ snapshots:
       - sass
       - typescript
 
-  '@mintel/tsconfig@1.8.3': {}
+  '@mintel/tsconfig@1.8.21': {}
 
   '@monaco-editor/loader@1.7.0':
     dependencies:
@@ -11479,6 +11556,8 @@ snapshots:
 
   '@tootallnate/quickjs-emscripten@0.23.0': {}
 
+  '@tweenjs/tween.js@23.1.3': {}
+
   '@tybys/wasm-util@0.10.1':
     dependencies:
       tslib: 2.8.1
@@ -11611,6 +11690,10 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
+  '@types/node@22.19.13':
+    dependencies:
+      undici-types: 6.21.0
+
   '@types/nodemailer@7.0.9':
     dependencies:
       '@types/node': 22.19.10
@@ -11659,10 +11742,22 @@ snapshots:
     dependencies:
       '@types/node': 22.19.10
 
+  '@types/stats.js@0.17.4': {}
+
   '@types/tedious@4.0.14':
     dependencies:
       '@types/node': 22.19.10
 
+  '@types/three@0.183.1':
+    dependencies:
+      '@dimforge/rapier3d-compat': 0.12.0
+      '@tweenjs/tween.js': 23.1.3
+      '@types/stats.js': 0.17.4
+      '@types/webxr': 0.5.24
+      '@webgpu/types': 0.1.69
+      fflate: 0.8.2
+      meshoptimizer: 1.0.1
+
   '@types/trusted-types@2.0.7':
     optional: true
 
@@ -11674,6 +11769,8 @@ snapshots:
 
   '@types/uuid@10.0.0': {}
 
+  '@types/webxr@0.5.24': {}
+
   '@types/whatwg-mimetype@3.0.2': {}
 
   '@types/ws@8.18.1':
@@ -11685,14 +11782,14 @@ snapshots:
       '@types/node': 22.19.11
     optional: true
 
-  '@typescript-eslint/eslint-plugin@8.55.0(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.56.1(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.55.0
-      '@typescript-eslint/type-utils': 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.55.0
+      '@typescript-eslint/parser': 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.56.1
+      '@typescript-eslint/type-utils': 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.56.1
       eslint: 9.39.2(jiti@2.6.1)
       ignore: 7.0.5
       natural-compare: 1.4.0
@@ -11701,41 +11798,41 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.55.0
-      '@typescript-eslint/types': 8.55.0
-      '@typescript-eslint/typescript-estree': 8.55.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.55.0
+      '@typescript-eslint/scope-manager': 8.56.1
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.56.1
       debug: 4.4.3
       eslint: 9.39.2(jiti@2.6.1)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.55.0(typescript@5.9.3)':
+  '@typescript-eslint/project-service@8.56.1(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.55.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.55.0
+      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.56.1
       debug: 4.4.3
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@8.55.0':
+  '@typescript-eslint/scope-manager@8.56.1':
     dependencies:
-      '@typescript-eslint/types': 8.55.0
-      '@typescript-eslint/visitor-keys': 8.55.0
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/visitor-keys': 8.56.1
 
-  '@typescript-eslint/tsconfig-utils@8.55.0(typescript@5.9.3)':
+  '@typescript-eslint/tsconfig-utils@8.56.1(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
-  '@typescript-eslint/type-utils@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/type-utils@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/types': 8.55.0
-      '@typescript-eslint/typescript-estree': 8.55.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       debug: 4.4.3
       eslint: 9.39.2(jiti@2.6.1)
       ts-api-utils: 2.4.0(typescript@5.9.3)
@@ -11743,16 +11840,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.55.0': {}
+  '@typescript-eslint/types@8.56.1': {}
 
-  '@typescript-eslint/typescript-estree@8.55.0(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@8.56.1(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.55.0(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.55.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.55.0
-      '@typescript-eslint/visitor-keys': 8.55.0
+      '@typescript-eslint/project-service': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/visitor-keys': 8.56.1
       debug: 4.4.3
-      minimatch: 10.2.2
+      minimatch: 10.2.4
       semver: 7.7.4
       tinyglobby: 0.2.15
       ts-api-utils: 2.4.0(typescript@5.9.3)
@@ -11760,21 +11857,21 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/utils@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.55.0
-      '@typescript-eslint/types': 8.55.0
-      '@typescript-eslint/typescript-estree': 8.55.0(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.56.1
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.9.3)
       eslint: 9.39.2(jiti@2.6.1)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.55.0':
+  '@typescript-eslint/visitor-keys@8.56.1':
     dependencies:
-      '@typescript-eslint/types': 8.55.0
-      eslint-visitor-keys: 4.2.1
+      '@typescript-eslint/types': 8.56.1
+      eslint-visitor-keys: 5.0.1
 
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
     optional: true
@@ -11975,6 +12072,8 @@ snapshots:
       '@webassemblyjs/ast': 1.14.1
       '@xtuc/long': 4.2.2
 
+  '@webgpu/types@0.1.69': {}
+
   '@xtuc/ieee754@1.2.0': {}
 
   '@xtuc/long@4.2.2': {}
@@ -12050,6 +12149,13 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
+  ajv@6.14.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
+
   ajv@8.17.1:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -12240,6 +12346,8 @@ snapshots:
 
   balanced-match@4.0.3: {}
 
+  balanced-match@4.0.4: {}
+
   bare-events@2.8.2: {}
 
   bare-fs@4.5.3:
@@ -12328,6 +12436,10 @@ snapshots:
     dependencies:
       balanced-match: 4.0.3
 
+  brace-expansion@5.0.4:
+    dependencies:
+      balanced-match: 4.0.4
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -13369,18 +13481,18 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-config-next@16.1.6(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3):
+  eslint-config-next@16.1.6(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3):
     dependencies:
       '@next/eslint-plugin-next': 16.1.6
       eslint: 9.39.2(jiti@2.6.1)
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@9.39.2(jiti@2.6.1))
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1))
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1))
       eslint-plugin-jsx-a11y: 6.10.2(eslint@9.39.2(jiti@2.6.1))
       eslint-plugin-react: 7.37.5(eslint@9.39.2(jiti@2.6.1))
       eslint-plugin-react-hooks: 7.0.1(eslint@9.39.2(jiti@2.6.1))
       globals: 16.4.0
-      typescript-eslint: 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      typescript-eslint: 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
     optionalDependencies:
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -13408,22 +13520,22 @@ snapshots:
       tinyglobby: 0.2.15
       unrs-resolver: 1.11.1
     optionalDependencies:
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1))
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1))
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1)):
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
-      '@typescript-eslint/parser': 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       eslint: 9.39.2(jiti@2.6.1)
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@9.39.2(jiti@2.6.1))
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1)):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -13434,11 +13546,11 @@ snapshots:
       doctrine: 2.1.0
       eslint: 9.39.2(jiti@2.6.1)
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1))
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@2.6.1))
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
-      minimatch: 10.2.2
+      minimatch: 10.2.4
       object.fromentries: 2.0.8
       object.groupby: 1.0.3
       object.values: 1.2.1
@@ -13446,7 +13558,7 @@ snapshots:
       string.prototype.trimend: 1.0.9
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
@@ -13466,7 +13578,7 @@ snapshots:
       hasown: 2.0.2
       jsx-ast-utils: 3.3.5
       language-tags: 1.0.9
-      minimatch: 10.2.2
+      minimatch: 10.2.4
       object.fromentries: 2.0.8
       safe-regex-test: 1.1.0
       string.prototype.includes: 2.0.1
@@ -13494,12 +13606,12 @@ snapshots:
       estraverse: 5.3.0
       hasown: 2.0.2
       jsx-ast-utils: 3.3.5
-      minimatch: 10.2.2
+      minimatch: 10.2.4
       object.entries: 1.1.9
       object.fromentries: 2.0.8
       object.values: 1.2.1
       prop-types: 15.8.1
-      resolve: 2.0.0-next.5
+      resolve: 2.0.0-next.6
       semver: 6.3.1
       string.prototype.matchall: 4.0.12
       string.prototype.repeat: 1.0.0
@@ -13518,6 +13630,8 @@ snapshots:
 
   eslint-visitor-keys@4.2.1: {}
 
+  eslint-visitor-keys@5.0.1: {}
+
   eslint@9.39.2(jiti@2.6.1):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
@@ -14523,7 +14637,7 @@ snapshots:
 
   jest-worker@27.5.1:
     dependencies:
-      '@types/node': 22.19.11
+      '@types/node': 22.19.13
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
@@ -14999,6 +15113,8 @@ snapshots:
 
   merge2@1.4.1: {}
 
+  meshoptimizer@1.0.1: {}
+
   metaviewport-parser@0.3.0: {}
 
   methods@1.1.2: {}
@@ -15201,6 +15317,10 @@ snapshots:
     dependencies:
       brace-expansion: 5.0.2
 
+  minimatch@10.2.4:
+    dependencies:
+      brace-expansion: 5.0.4
+
   minimist@1.2.8: {}
 
   minipass@7.1.2: {}
@@ -15323,6 +15443,13 @@ snapshots:
 
   node-addon-api@7.1.1: {}
 
+  node-exports-info@1.6.0:
+    dependencies:
+      array.prototype.flatmap: 1.3.3
+      es-errors: 1.3.0
+      object.entries: 1.1.9
+      semver: 6.3.1
+
   node-fetch@2.7.0:
     dependencies:
       whatwg-url: 5.0.0
@@ -16248,9 +16375,12 @@ snapshots:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  resolve@2.0.0-next.5:
+  resolve@2.0.0-next.6:
     dependencies:
+      es-errors: 1.3.0
       is-core-module: 2.16.1
+      node-exports-info: 1.6.0
+      object-keys: 1.1.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
@@ -17111,12 +17241,12 @@ snapshots:
     dependencies:
       is-typedarray: 1.0.0
 
-  typescript-eslint@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3):
+  typescript-eslint@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.55.0(@typescript-eslint/parser@8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/typescript-estree': 8.55.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.55.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.56.1(@typescript-eslint/parser@8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.56.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       eslint: 9.39.2(jiti@2.6.1)
       typescript: 5.9.3
     transitivePeerDependencies:
diff --git a/scripts/check-apis.ts b/scripts/check-apis.ts
new file mode 100644
index 00000000..87dafffa
--- /dev/null
+++ b/scripts/check-apis.ts
@@ -0,0 +1,119 @@
+import axios from 'axios';
+import dns from 'dns';
+import { promisify } from 'util';
+import url from 'url';
+
+const resolve4 = promisify(dns.resolve4);
+
+// This script verifies that external logging and analytics APIs are reachable
+// from the deployment environment (which could be behind corporate firewalls or VPNs).
+
+const umamiEndpoint = process.env.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me';
+const sentryDsn = process.env.SENTRY_DSN || '';
+
+async function checkUmami() {
+  console.log(`\n🔍 Checking Umami Analytics API Availability...`);
+  console.log(`   Endpoint: ${umamiEndpoint}`);
+
+  try {
+    // Umami usually exposes a /api/heartbeat or /api/health if we know the route.
+    // Trying root or /api/auth/verify (which will give 401 but proves routing works).
+    // A simple GET to the configured endpoint should return a 200 or 401, not a 5xx/timeout.
+    const response = await axios.get(`${umamiEndpoint.replace(/\/$/, '')}/api/health`, {
+      timeout: 5000,
+      validateStatus: () => true, // Accept any status, we just want to know it's reachable and not 5xx
+    });
+
+    // As long as it's not a 502/503/504 Bad Gateway/Timeout, the service is "up" from our perspective
+    if (response.status >= 500) {
+      throw new Error(`Umami API responded with server error HTTP ${response.status}`);
+    }
+
+    console.log(`   ✅ Umami Analytics is reachable (HTTP ${response.status})`);
+    return true;
+  } catch (err: any) {
+    // If /api/health fails completely, maybe try a DNS check as a fallback
+    try {
+      console.warn(`   ⚠️ HTTP check failed, falling back to DNS resolution...`);
+      const umamiHost = new url.URL(umamiEndpoint).hostname;
+      await resolve4(umamiHost);
+      console.log(`   ✅ Umami Analytics DNS resolved successfully (${umamiHost})`);
+      return true;
+    } catch (dnsErr: any) {
+      console.error(
+        `   ❌ CRITICAL: Umami Analytics is completely unreachable! ${err.message} | DNS: ${dnsErr.message}`,
+      );
+      return false;
+    }
+  }
+}
+
+async function checkSentry() {
+  console.log(`\n🔍 Checking Glitchtip/Sentry Error Tracking Availability...`);
+
+  if (!sentryDsn) {
+    console.log(`   ℹ️ No SENTRY_DSN provided in environment. Skipping.`);
+    return true;
+  }
+
+  try {
+    const parsedDsn = new url.URL(sentryDsn);
+    const host = parsedDsn.hostname;
+    console.log(`   Host: ${host}`);
+
+    // We do a DNS lookup to ensure the runner can actually resolve the tracking server
+    const addresses = await resolve4(host);
+
+    if (addresses && addresses.length > 0) {
+      console.log(`   ✅ Glitchtip/Sentry domain resolved: ${addresses[0]}`);
+
+      // Optional: Quick TCP/HTTP check to the host root (Glitchtip usually runs on 80/443 root)
+      try {
+        const proto = parsedDsn.protocol || 'https:';
+        await axios.get(`${proto}//${host}/api/0/`, {
+          timeout: 5000,
+          validateStatus: () => true,
+        });
+        console.log(`   ✅ Glitchtip/Sentry API root responds to HTTP.`);
+      } catch (ignore) {
+        console.log(
+          `   ⚠️ Glitchtip/Sentry HTTP ping failed or timed out, but DNS is valid. Proceeding.`,
+        );
+      }
+
+      return true;
+    }
+    throw new Error('No IP addresses found for DSN host');
+  } catch (err: any) {
+    console.error(
+      `   ❌ CRITICAL: Glitchtip/Sentry DSN is invalid or hostname is unresolvable! ${err.message}`,
+    );
+    return false;
+  }
+}
+
+async function main() {
+  console.log('🚀 Starting External API Connectivity Smoke Test...');
+
+  let hasErrors = false;
+
+  const umamiOk = await checkUmami();
+  if (!umamiOk) hasErrors = true;
+
+  const sentryOk = await checkSentry();
+  if (!sentryOk) hasErrors = true;
+
+  if (hasErrors) {
+    console.error(
+      `\n🚨 POST-DEPLOY CHECK FAILED: One or more critical external APIs are unreachable.`,
+    );
+    console.error(`   This might mean the deployment environment lacks outbound internet access, `);
+    console.error(`   DNS is misconfigured, or the upstream services are down.`);
+    process.exit(1);
+  }
+
+  console.log(`\n🎉 SUCCESS: All required external APIs are reachable!`);
+  process.exit(0);
+}
+
+main();
diff --git a/scripts/check-forms.ts b/scripts/check-forms.ts
new file mode 100644
index 00000000..691a586b
--- /dev/null
+++ b/scripts/check-forms.ts
@@ -0,0 +1,170 @@
+import puppeteer, { HTTPResponse } from 'puppeteer';
+import axios from 'axios';
+import * as cheerio from 'cheerio';
+
+const targetUrl = process.argv[2] || process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000';
+const gatekeeperPassword = process.env.GATEKEEPER_PASSWORD || 'klz2026';
+
+async function main() {
+  console.log(`\n🚀 Starting E2E Form Submission Check for: ${targetUrl}`);
+
+  // 1. Fetch Sitemap to discover the contact page and a product page
+  const sitemapUrl = `${targetUrl.replace(/\/$/, '')}/sitemap.xml`;
+  let urls: string[] = [];
+
+  try {
+    console.log(`📥 Fetching sitemap from ${sitemapUrl}...`);
+    const response = await axios.get(sitemapUrl, {
+      headers: { Cookie: `klz_gatekeeper_session=${gatekeeperPassword}` },
+    });
+
+    const $ = cheerio.load(response.data, { xmlMode: true });
+    urls = $('url loc')
+      .map((i, el) => $(el).text())
+      .get();
+
+    // Normalize to target URL instance
+    const urlPattern = /https?:\/\/[^\/]+/;
+    urls = [...new Set(urls)]
+      .filter((u) => u.startsWith('http'))
+      .map((u) => u.replace(urlPattern, targetUrl.replace(/\/$/, '')))
+      .sort();
+  } catch (err: any) {
+    console.error(`❌ Failed to fetch sitemap: ${err.message}`);
+    process.exit(1);
+  }
+
+  const contactUrl = urls.find((u) => u.includes('/de/kontakt'));
+  // Ensure we select an actual product page (depth >= 7: http://host/de/produkte/category/product)
+  const productUrl = urls.find(
+    (u) =>
+      u.includes('/de/produkte/') && new URL(u).pathname.split('/').filter(Boolean).length >= 4,
+  );
+
+  if (!contactUrl) {
+    console.error(`❌ Could not find contact page in sitemap. Ensure /de/kontakt exists.`);
+    process.exit(1);
+  }
+
+  if (!productUrl) {
+    console.error(
+      `❌ Could not find a product page in sitemap. Form testing requires at least one product page.`,
+    );
+    process.exit(1);
+  }
+
+  console.log(`✅ Discovered Contact Page: ${contactUrl}`);
+  console.log(`✅ Discovered Product Page: ${productUrl}`);
+
+  // 2. Launch Headless Browser
+  console.log(`\n🕷️ Launching Puppeteer Headless Engine...`);
+  const browser = await puppeteer.launch({
+    headless: true,
+    executablePath: process.env.PUPPETEER_EXECUTABLE_PATH || process.env.CHROME_PATH || undefined,
+    args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
+  });
+
+  const page = await browser.newPage();
+
+  // 3. Inject Gatekeeper session bypassing auth screens
+  console.log(`\n🛡️ Injecting Gatekeeper Session...`);
+  await page.setCookie({
+    name: 'klz_gatekeeper_session',
+    value: gatekeeperPassword,
+    domain: new URL(targetUrl).hostname,
+    path: '/',
+    httpOnly: true,
+    secure: targetUrl.startsWith('https://'),
+  });
+
+  let hasErrors = false;
+
+  // 4. Test Contact Form
+  try {
+    console.log(`\n🧪 Testing Contact Form on: ${contactUrl}`);
+    await page.goto(contactUrl, { waitUntil: 'networkidle0', timeout: 30000 });
+
+    // Ensure React has hydrated completely
+    await page.waitForNetworkIdle({ idleTime: 1000, timeout: 15000 }).catch(() => {});
+
+    // Ensure form is visible and interactive
+    try {
+      // Find the form input by name
+      await page.waitForSelector('input[name="name"]', { visible: true, timeout: 15000 });
+    } catch (e) {
+      console.error('Failed to find Contact Form input. Page Title:', await page.title());
+      throw e;
+    }
+
+    // Fill form fields
+    await page.type('input[name="name"]', 'Automated E2E Test');
+    await page.type('input[name="email"]', 'testing@mintel.me');
+    await page.type(
+      'textarea[name="message"]',
+      'This is an automated test verifying the contact form submission.',
+    );
+
+    console.log(`   Submitting Contact Form...`);
+
+    // Explicitly click submit and wait for navigation/state-change
+    await Promise.all([
+      page.waitForSelector('[role="alert"][aria-live="polite"]', { timeout: 15000 }),
+      page.click('button[type="submit"]'),
+    ]);
+
+    console.log(`✅ Contact Form submitted successfully! (Success state verified)`);
+  } catch (err: any) {
+    console.error(`❌ Contact Form Test Failed: ${err.message}`);
+    hasErrors = true;
+  }
+
+  // 4. Test Product Quote Form
+  try {
+    console.log(`\n🧪 Testing Product Quote Form on: ${productUrl}`);
+    await page.goto(productUrl, { waitUntil: 'networkidle0', timeout: 30000 });
+
+    // Ensure React has hydrated completely
+    await page.waitForNetworkIdle({ idleTime: 1000, timeout: 15000 }).catch(() => {});
+
+    // The product form uses dynamic IDs, so we select by input type in the specific form context
+    try {
+      await page.waitForSelector('form input[type="email"]', { visible: true, timeout: 15000 });
+    } catch (e) {
+      console.error('Failed to find Product Quote Form input. Page Title:', await page.title());
+      throw e;
+    }
+
+    // In RequestQuoteForm, the email input is type="email" and message is a textarea.
+    await page.type('form input[type="email"]', 'testing@mintel.me');
+    await page.type(
+      'form textarea',
+      'Automated request for product quote via E2E testing framework.',
+    );
+
+    console.log(`   Submitting Product Quote Form...`);
+
+    // Submit and wait for success state
+    await Promise.all([
+      page.waitForSelector('[role="alert"][aria-live="polite"]', { timeout: 15000 }),
+      page.click('form button[type="submit"]'),
+    ]);
+
+    console.log(`✅ Product Quote Form submitted successfully! (Success state verified)`);
+  } catch (err: any) {
+    console.error(`❌ Product Quote Form Test Failed: ${err.message}`);
+    hasErrors = true;
+  }
+
+  await browser.close();
+
+  // 5. Evaluation
+  if (hasErrors) {
+    console.error(`\n🚨 IMPORTANT: Form E2E checks failed. The CI build is failing.`);
+    process.exit(1);
+  } else {
+    console.log(`\n🎉 SUCCESS: All form submissions arrived and handled correctly!`);
+    process.exit(0);
+  }
+}
+
+main();
diff --git a/scripts/check-html.ts b/scripts/check-html.ts
index b0dcb043..b822aca3 100644
--- a/scripts/check-html.ts
+++ b/scripts/check-html.ts
@@ -50,7 +50,12 @@ async function main() {
           headers: { Cookie: `klz_gatekeeper_session=${gatekeeperPassword}` },
           validateStatus: (status) => status < 400,
         });
-        const filename = `page-${i}.html`;
+
+        // Generate a safe filename that retains URL information
+        const urlStr = new URL(u);
+        const safePath = (urlStr.pathname + urlStr.search).replace(/[^a-zA-Z0-9]/g, '_');
+        const filename = `${safePath || 'index'}.html`;
+
         fs.writeFileSync(path.join(outputDir, filename), res.data);
       } catch (err: any) {
         console.error(`❌ HTTP Error fetching ${u}: ${err.message}`);
diff --git a/scripts/cms-sync.sh b/scripts/cms-sync.sh
index 9ccabce9..db7c2eaf 100755
--- a/scripts/cms-sync.sh
+++ b/scripts/cms-sync.sh
@@ -53,12 +53,17 @@ TIMESTAMP=$(date +"%Y%m%d_%H%M%S")
 REMOTE_DB_USER=""
 REMOTE_DB_NAME=""
 
-# Migration names to insert after restore (keeps Payload from prompting)
-MIGRATIONS=(
-  "20260223_195005_products_collection:1"
-  "20260223_195151_remove_sku_unique:2"
-  "20260225_003500_add_pages_collection:3"
-)
+# Auto-detect migrations from src/migrations/*.ts (no manual maintenance needed)
+MIGRATIONS=()
+BATCH=1
+for migration_file in $(ls src/migrations/*.ts 2>/dev/null | sort); do
+  name=$(basename "$migration_file" .ts)
+  MIGRATIONS+=("$name:$BATCH")
+  ((BATCH++))
+done
+if [ ${#MIGRATIONS[@]} -eq 0 ]; then
+  echo "⚠️  No migration files found in src/migrations/"
+fi
 
 # ── Resolve target environment ─────────────────────────────────────────────
 resolve_target() {
@@ -158,6 +163,29 @@ backup_remote_db() {
   REMOTE_BACKUP_FILE="$file"
 }
 
+# ── Pre-flight: Verify remote containers exist ─────────────────────────────
+check_remote_containers() {
+  echo "🔍 Checking $TARGET containers..."
+  local missing=0
+  if ! ssh "$SSH_HOST" "docker ps -q -f name=$REMOTE_DB_CONTAINER" | grep -q .; then
+    echo "❌ Database container '$REMOTE_DB_CONTAINER' not found on $SSH_HOST"
+    echo "   → Deploy $TARGET first: git push to trigger pipeline, or run:"
+    echo "     ssh $SSH_HOST \"cd $REMOTE_SITE_DIR && docker compose -p $REMOTE_PROJECT --env-file .env.\$TARGET up -d\""
+    missing=1
+  fi
+  if ! ssh "$SSH_HOST" "docker ps -q -f name=$REMOTE_APP_CONTAINER" | grep -q .; then
+    echo "❌ App container '$REMOTE_APP_CONTAINER' not found on $SSH_HOST"
+    missing=1
+  fi
+  if [ $missing -eq 1 ]; then
+    echo ""
+    echo "💡 The $TARGET environment hasn't been deployed yet."
+    echo "   Push to the '$TARGET' branch or run the pipeline first."
+    exit 1
+  fi
+  echo "✅ All $TARGET containers running."
+}
+
 # ── PUSH: local → remote ──────────────────────────────────────────────────
 do_push() {
   echo ""
@@ -171,8 +199,9 @@ do_push() {
   echo ""
   [[ ! $REPLY =~ ^[Yy]$ ]] && { echo "Cancelled."; exit 0; }
 
-  # 0. Ensure local DB is running
+  # 0. Ensure local DB is running & remote containers exist
   ensure_local_db
+  check_remote_containers
 
   # 1. Safety backup of remote
   backup_remote_db
@@ -226,8 +255,9 @@ do_pull() {
   echo ""
   [[ ! $REPLY =~ ^[Yy]$ ]] && { echo "Cancelled."; exit 0; }
 
-  # 0. Ensure local DB is running
+  # 0. Ensure local DB is running & remote containers exist
   ensure_local_db
+  check_remote_containers
 
   # 1. Safety backup of local
   backup_local_db