fix(analytics): bypass gatekeeper and middleware for tracking endpoints

chore: cms branding scripts
fix: eslint and tests
2026-02-06 23:16:52 +01:00 · 2026-02-06 23:11:57 +01:00 · 2026-02-06 22:46:53 +01:00 · 2026-02-06 22:35:49 +01:00 · 2026-02-06 21:43:53 +01:00 · 2026-02-06 19:19:40 +01:00
80 changed files with 7923 additions and 1782 deletions
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 # Application
 NODE_ENV=production
 NEXT_PUBLIC_BASE_URL=https://klz-cables.com
-UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
+UMAMI_API_ENDPOINT=https://analytics.infra.mintel.me
 NEXT_PUBLIC_UMAMI_WEBSITE_ID=59a7db94-0100-4c7e-98ef-99f45b17f9c3
 SENTRY_DSN=https://c10957d0182245b1a2a806ac2d34a197@errors.infra.mintel.me/1
 LOG_LEVEL=info
@@ -28,4 +28,9 @@ DIRECTUS_ADMIN_EMAIL=marc@mintel.me
 DIRECTUS_ADMIN_PASSWORD=Tim300493.
 DIRECTUS_DB_NAME=directus
 DIRECTUS_DB_USER=directus
-DIRECTUS_DB_PASSWORD=directus
+# Local Development
+PROJECT_NAME=klz-cables
+TRAEFIK_HOST=klz.localhost
+DIRECTUS_HOST=cms.klz.localhost
+GATEKEEPER_PASSWORD=klz2026
+COOKIE_DOMAIN=localhost
--- a/.env.example
+++ b/.env.example
@@ -10,13 +10,18 @@
 # ────────────────────────────────────────────────────────────────────────────
 NODE_ENV=development
 NEXT_PUBLIC_BASE_URL=http://localhost:3000
+# TARGET is used to differentiate between environments (testing, staging, production)
+# NEXT_PUBLIC_TARGET makes this information available to the frontend
+NEXT_PUBLIC_TARGET=development
+# TARGET is used server-side
+TARGET=development

 # ────────────────────────────────────────────────────────────────────────────
 # Analytics (Umami)
 # ────────────────────────────────────────────────────────────────────────────
 # Optional: Leave empty to disable analytics
 NEXT_PUBLIC_UMAMI_WEBSITE_ID=
-NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
+UMAMI_API_ENDPOINT=https://analytics.infra.mintel.me

 # ────────────────────────────────────────────────────────────────────────────
 # Error Tracking (GlitchTip/Sentry)
@@ -39,6 +44,10 @@ MAIL_RECIPIENTS=info@klz-cables.com
 # Logging
 # ────────────────────────────────────────────────────────────────────────────
 LOG_LEVEL=info
+GATEKEEPER_PASSWORD=klz2026
+SENTRY_DSN=
+# For Directus Error Tracking
+# SENTRY_ENVIRONMENT is set automatically by CI

 # ────────────────────────────────────────────────────────────────────────────
 # Deployment Configuration (CI/CD only)
@@ -49,22 +58,9 @@ TRAEFIK_HOST=klz-cables.com
 ENV_FILE=.env

 # ────────────────────────────────────────────────────────────────────────────
-# Varnish Cache (Docker only)
+# Varnish Configuration
 # ────────────────────────────────────────────────────────────────────────────
-VARNISH_CACHE_SIZE=256m
-
-# ────────────────────────────────────────────────────────────────────────────
-# Strapi CMS
-# ────────────────────────────────────────────────────────────────────────────
-STRAPI_DATABASE_NAME=strapi
-STRAPI_DATABASE_USERNAME=strapi
-STRAPI_DATABASE_PASSWORD=strapi
-STRAPI_URL=http://localhost:1337
-APP_KEYS=toBeModified1,toBeModified2
-API_TOKEN_SALT=tobemodified
-ADMIN_JWT_SECRET=tobemodified
-TRANSFER_TOKEN_SALT=tobemodified
-JWT_SECRET=tobemodified
+VARNISH_CACHE_SIZE=256M

 # ============================================================================
 # IMPORTANT NOTES
--- a/.env.production
+++ b/.env.production
@@ -13,7 +13,7 @@ NEXT_PUBLIC_BASE_URL=https://klz-cables.com

 # Analytics (Umami)
 NEXT_PUBLIC_UMAMI_WEBSITE_ID=
-NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
+UMAMI_API_ENDPOINT=https://analytics.infra.mintel.me

 # Error Tracking (GlitchTip/Sentry)
 SENTRY_DSN=
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,12 +1,16 @@
 {
-  "extends": ["next/core-web-vitals", "next/typescript"],
+  "extends": ["next/core-web-vitals", "next/typescript", "prettier"],
  "rules": {
    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }],
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      {
+        "argsIgnorePattern": "^_"
+      }
+    ],
    "@typescript-eslint/no-require-imports": "off",
    "prefer-const": "warn",
    "react/no-unescaped-entities": "off",
    "@next/next/no-img-element": "warn"
  }
 }
-
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -14,8 +14,8 @@ on:
        default: 'false'

 concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: false
+  group: ${{ github.workflow }}-${{ (github.ref_type == 'tag' && !contains(github.ref_name, '-')) && 'prod' || (github.ref_type == 'tag' && 'staging' || 'testing') }}
+  cancel-in-progress: true

 jobs:
  # ──────────────────────────────────────────────────────────────────────────────
@@ -38,53 +38,70 @@ jobs:
      gotify_priority:  ${{ steps.determine.outputs.gotify_priority }}
      short_sha:        ${{ steps.determine.outputs.short_sha }}
      commit_msg:       ${{ steps.determine.outputs.commit_msg }}
+    container:
+      image: catthehacker/ubuntu:act-latest
    steps:
+      - name: 🧹 Maintenance (High Density Cleanup)
+        shell: bash
+        run: |
+          echo "Purging old build layers and dangling images..."
+          docker image prune -f
+          docker builder prune -f --filter "until=6h"
+
      - name: Checkout repository
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 2
+

      - name: 🔍 Environment & Version ermitteln
        id: determine
+        shell: bash
        run: |
          TAG="${{ github.ref_name }}"
-          SHORT_SHA="${{ github.sha }}"
-          SHORT_SHA="${SHORT_SHA:0:9}"
+          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-9)
+          IMAGE_TAG="sha-${SHORT_SHA}"
          COMMIT_MSG=$(git log -1 --pretty=%s || echo "No commit message available")

          if [[ "${{ github.ref_type }}" == "branch" && "$TAG" == "main" ]]; then
-            TARGET="testing"
-            IMAGE_TAG="main-${SHORT_SHA}"
-            ENV_FILE=".env.testing"
-            TRAEFIK_HOST='`testing.klz-cables.com`'
-            NEXT_PUBLIC_BASE_URL="https://testing.klz-cables.com"
-            DIRECTUS_URL="https://cms-testing.klz-cables.com"
-            DIRECTUS_HOST='`cms-testing.klz-cables.com`'
-            PROJECT_NAME="klz-cables-testing"
-            IS_PROD="false"
-            GOTIFY_TITLE="🧪 Testing-Deploy"
-            GOTIFY_PRIORITY=4
+            if [[ "$COMMIT_MSG" =~ ^chore: ]]; then
+              TARGET="skip"
+              GOTIFY_TITLE="ℹ️ Skip Deploy (Chore)"
+              GOTIFY_PRIORITY=2
+            else
+              TARGET="testing"
+              IMAGE_TAG="main-${SHORT_SHA}"
+              ENV_FILE=".env.testing"
+              TRAEFIK_HOST="testing.klz-cables.com"
+              NEXT_PUBLIC_BASE_URL="https://testing.klz-cables.com"
+              DIRECTUS_URL="https://cms.testing.klz-cables.com"
+              DIRECTUS_HOST="cms.testing.klz-cables.com"
+              PROJECT_NAME="klz-cables-testing"
+              IS_PROD="false"
+              GOTIFY_TITLE="🧪 Testing-Deploy"
+              GOTIFY_PRIORITY=4
+            fi
          elif [[ "${{ github.ref_type }}" == "tag" ]]; then
            if [[ "$TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
              TARGET="production"
              IMAGE_TAG="$TAG"
              ENV_FILE=".env.prod"
-              TRAEFIK_HOST='`klz-cables.com`, `www.klz-cables.com`'
+              TRAEFIK_HOST="klz-cables.com, www.klz-cables.com"
              NEXT_PUBLIC_BASE_URL="https://klz-cables.com"
              DIRECTUS_URL="https://cms.klz-cables.com"
-              DIRECTUS_HOST='`cms.klz-cables.com`'
+              DIRECTUS_HOST="cms.klz-cables.com"
              PROJECT_NAME="klz-cables-prod"
              IS_PROD="true"
              GOTIFY_TITLE="🚀 Production-Release"
              GOTIFY_PRIORITY=6
-            elif [[ "$TAG" =~ -rc\. || "$TAG" =~ -beta\. || "$TAG" =~ -alpha\. ]]; then
+            elif [[ "$TAG" =~ -rc || "$TAG" =~ -beta || "$TAG" =~ -alpha ]]; then
              TARGET="staging"
              IMAGE_TAG="$TAG"
              ENV_FILE=".env.staging"
-              TRAEFIK_HOST='`staging.klz-cables.com`'
+              TRAEFIK_HOST="staging.klz-cables.com"
              NEXT_PUBLIC_BASE_URL="https://staging.klz-cables.com"
-              DIRECTUS_URL="https://cms-staging.klz-cables.com"
-              DIRECTUS_HOST='`cms-staging.klz-cables.com`'
+              DIRECTUS_URL="https://cms.staging.klz-cables.com"
+              DIRECTUS_HOST="cms.staging.klz-cables.com"
              PROJECT_NAME="klz-cables-staging"
              IS_PROD="false"
              GOTIFY_TITLE="🧪 Staging-Deploy (Pre-Release)"
@@ -98,19 +115,21 @@ jobs:
            TARGET="skip"
          fi

-          echo "target=$TARGET" >> $GITHUB_OUTPUT
-          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
-          echo "env_file=$ENV_FILE" >> $GITHUB_OUTPUT
-          echo "traefik_host=$TRAEFIK_HOST" >> $GITHUB_OUTPUT
-          echo "next_public_base_url=$NEXT_PUBLIC_BASE_URL" >> $GITHUB_OUTPUT
-          echo "directus_url=$DIRECTUS_URL" >> $GITHUB_OUTPUT
-          echo "directus_host=$DIRECTUS_HOST" >> $GITHUB_OUTPUT
-          echo "project_name=$PROJECT_NAME" >> $GITHUB_OUTPUT
-          echo "is_prod=$IS_PROD" >> $GITHUB_OUTPUT
-          echo "gotify_title=$GOTIFY_TITLE" >> $GITHUB_OUTPUT
-          echo "gotify_priority=$GOTIFY_PRIORITY" >> $GITHUB_OUTPUT
-          echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
-          echo "commit_msg=$COMMIT_MSG" >> $GITHUB_OUTPUT
+          {
+            echo "target=$TARGET"
+            echo "image_tag=$IMAGE_TAG"
+            echo "env_file=$ENV_FILE"
+            echo "traefik_host=$TRAEFIK_HOST"
+            echo "next_public_base_url=$NEXT_PUBLIC_BASE_URL"
+            echo "directus_url=$DIRECTUS_URL"
+            echo "directus_host=$DIRECTUS_HOST"
+            echo "project_name=$PROJECT_NAME"
+            echo "is_prod=$IS_PROD"
+            echo "gotify_title=$GOTIFY_TITLE"
+            echo "gotify_priority=$GOTIFY_PRIORITY"
+            echo "short_sha=$SHORT_SHA"
+            echo "commit_msg=$COMMIT_MSG"
+          } >> "$GITHUB_OUTPUT"

  # ──────────────────────────────────────────────────────────────────────────────
  # JOB 2: Quality Assurance (Lint & Test)
@@ -120,26 +139,21 @@ jobs:
    needs: prepare
    if: needs.prepare.outputs.target != 'skip'
    runs-on: docker
+    container:
+      image: catthehacker/ubuntu:act-latest
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1

      - name: Setup Node.js
        uses: actions/setup-node@v4
        with:
          node-version: 20
-          cache: 'npm'
-
-      - name: 📦 Restore npm cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-

      - name: Install dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps

      - name: 🧪 Run Checks in Parallel
        if: github.event.inputs.skip_long_checks != 'true'
@@ -159,48 +173,58 @@ jobs:
  # ──────────────────────────────────────────────────────────────────────────────
  # JOB 3: Build & Push Docker Image
  # ──────────────────────────────────────────────────────────────────────────────
-  build:
-    name: 🏗️ Build & Push
+  build-app:
+    name: 🏗️ Build App
    needs: prepare
+    if: ${{ needs.prepare.outputs.target != 'skip' }}
    runs-on: docker
+    container:
+      image: catthehacker/ubuntu:act-latest
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: 🐳 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3

      - name: 🔐 Registry Login
        run: |
          echo "${{ secrets.REGISTRY_PASS }}" | docker login registry.infra.mintel.me -u "${{ secrets.REGISTRY_USER }}" --password-stdin

-      - name: 🏗️ Docker Image bauen & pushen
+      - name: 🏗️ App bauen & pushen
        env:
          IMAGE_TAG: ${{ needs.prepare.outputs.image_tag }}
          TARGET:    ${{ needs.prepare.outputs.target }}
          NEXT_PUBLIC_BASE_URL:          ${{ needs.prepare.outputs.next_public_base_url }}
          NEXT_PUBLIC_UMAMI_WEBSITE_ID:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_WEBSITE_ID  || secrets.TESTING_NEXT_PUBLIC_UMAMI_WEBSITE_ID  || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID) }}
-          NEXT_PUBLIC_UMAMI_SCRIPT_URL:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.TESTING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL) }}
+          UMAMI_API_ENDPOINT:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.TESTING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL) }}
          DIRECTUS_URL:                  ${{ needs.prepare.outputs.directus_url }}
        run: |
-          echo "🏗️ Building → $TARGET / $IMAGE_TAG"
          docker buildx build \
            --pull \
            --platform linux/arm64 \
            --build-arg NEXT_PUBLIC_BASE_URL="$NEXT_PUBLIC_BASE_URL" \
            --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID="$NEXT_PUBLIC_UMAMI_WEBSITE_ID" \
-            --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL="$NEXT_PUBLIC_UMAMI_SCRIPT_URL" \
+            --build-arg UMAMI_API_ENDPOINT="$UMAMI_API_ENDPOINT" \
+            --build-arg NEXT_PUBLIC_TARGET="$TARGET" \
            --build-arg DIRECTUS_URL="$DIRECTUS_URL" \
            -t registry.infra.mintel.me/mintel/klz-cables.com:$IMAGE_TAG \
            --cache-from type=registry,ref=registry.infra.mintel.me/mintel/klz-cables.com:buildcache \
            --cache-to type=registry,ref=registry.infra.mintel.me/mintel/klz-cables.com:buildcache,mode=max \
            --push .

-
  # ──────────────────────────────────────────────────────────────────────────────
  # JOB 4: Deploy via SSH
  # ──────────────────────────────────────────────────────────────────────────────
  deploy:
    name: 🚀 Deploy
-    needs: [prepare, build, qa]
+    needs: [prepare, build-app, qa]
+    if: ${{ needs.prepare.outputs.target != 'skip' }}
    runs-on: docker
+    container:
+      image: catthehacker/ubuntu:act-latest
    env:
      TARGET:               ${{ needs.prepare.outputs.target }}
      IMAGE_TAG:            ${{ needs.prepare.outputs.image_tag }}
@@ -208,30 +232,34 @@ jobs:
      TRAEFIK_HOST:         ${{ needs.prepare.outputs.traefik_host }}
      NEXT_PUBLIC_BASE_URL:          ${{ needs.prepare.outputs.next_public_base_url }}
      NEXT_PUBLIC_UMAMI_WEBSITE_ID:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_WEBSITE_ID  || secrets.TESTING_NEXT_PUBLIC_UMAMI_WEBSITE_ID  || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID) }}
-      NEXT_PUBLIC_UMAMI_SCRIPT_URL:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.TESTING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL) }}
-      SENTRY_DSN:                    ${{ needs.prepare.outputs.target == 'production' && secrets.SENTRY_DSN                    || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_SENTRY_DSN                    || secrets.TESTING_SENTRY_DSN                    || secrets.SENTRY_DSN) }}
-      MAIL_HOST:                     ${{ secrets.MAIL_HOST }}
-      MAIL_PORT:                     ${{ secrets.MAIL_PORT }}
-      MAIL_USERNAME:                 ${{ secrets.MAIL_USERNAME }}
-      MAIL_PASSWORD:                 ${{ secrets.MAIL_PASSWORD }}
-      MAIL_FROM:                     ${{ secrets.MAIL_FROM }}
-      MAIL_RECIPIENTS:               ${{ secrets.MAIL_RECIPIENTS }}
+      UMAMI_API_ENDPOINT:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.TESTING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL) }}
+      SENTRY_DSN:                    ${{ secrets.SENTRY_DSN                    || vars.SENTRY_DSN                    || (needs.prepare.outputs.target == 'production' && secrets.SENTRY_DSN                    || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_SENTRY_DSN                    || secrets.TESTING_SENTRY_DSN                    || secrets.SENTRY_DSN)) }}
+      MAIL_HOST:                     ${{ secrets.MAIL_HOST || vars.MAIL_HOST || (needs.prepare.outputs.target == 'production' && (secrets.MAIL_HOST || vars.MAIL_HOST) || (needs.prepare.outputs.target == 'staging' && (secrets.STAGING_MAIL_HOST || vars.STAGING_MAIL_HOST) || (secrets.TESTING_MAIL_HOST || vars.TESTING_MAIL_HOST) || (secrets.MAIL_HOST || vars.MAIL_HOST))) }}
+      MAIL_PORT:                     ${{ secrets.MAIL_PORT || vars.MAIL_PORT || (needs.prepare.outputs.target == 'production' && (secrets.MAIL_PORT || vars.MAIL_PORT) || (needs.prepare.outputs.target == 'staging' && (secrets.STAGING_MAIL_PORT || vars.STAGING_MAIL_PORT) || (secrets.TESTING_MAIL_PORT || vars.TESTING_MAIL_PORT) || (secrets.MAIL_PORT || vars.MAIL_PORT))) }}
+      MAIL_USERNAME:                 ${{ secrets.MAIL_USERNAME || vars.MAIL_USERNAME || (needs.prepare.outputs.target == 'production' && (secrets.MAIL_USERNAME || vars.MAIL_USERNAME) || (needs.prepare.outputs.target == 'staging' && (secrets.STAGING_MAIL_USERNAME || vars.STAGING_MAIL_USERNAME) || (secrets.TESTING_MAIL_USERNAME || vars.TESTING_MAIL_USERNAME) || (secrets.MAIL_USERNAME || vars.MAIL_USERNAME))) }}
+      MAIL_PASSWORD:                 ${{ secrets.MAIL_PASSWORD || (needs.prepare.outputs.target == 'production' && secrets.MAIL_PASSWORD || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_MAIL_PASSWORD || secrets.TESTING_MAIL_PASSWORD || secrets.MAIL_PASSWORD)) }}
+      MAIL_FROM:                     ${{ secrets.MAIL_FROM || vars.MAIL_FROM || (needs.prepare.outputs.target == 'production' && (secrets.MAIL_FROM || vars.MAIL_FROM) || (needs.prepare.outputs.target == 'staging' && (secrets.STAGING_MAIL_FROM || vars.STAGING_MAIL_FROM) || (secrets.TESTING_MAIL_FROM || vars.TESTING_MAIL_FROM) || (secrets.MAIL_FROM || vars.MAIL_FROM))) }}
+      MAIL_RECIPIENTS:               ${{ secrets.MAIL_RECIPIENTS || vars.MAIL_RECIPIENTS || (needs.prepare.outputs.target == 'production' && (secrets.MAIL_RECIPIENTS || vars.MAIL_RECIPIENTS) || (needs.prepare.outputs.target == 'staging' && (secrets.STAGING_MAIL_RECIPIENTS || vars.STAGING_MAIL_RECIPIENTS) || (secrets.TESTING_MAIL_RECIPIENTS || vars.TESTING_MAIL_RECIPIENTS) || (secrets.MAIL_RECIPIENTS || vars.MAIL_RECIPIENTS))) }}
      DIRECTUS_URL:                  ${{ needs.prepare.outputs.directus_url }}
      DIRECTUS_HOST:                 ${{ needs.prepare.outputs.directus_host }}
      PROJECT_NAME:                  ${{ needs.prepare.outputs.project_name }}
-      DIRECTUS_KEY:                  ${{ secrets.DIRECTUS_KEY }}
-      DIRECTUS_SECRET:               ${{ secrets.DIRECTUS_SECRET }}
-      DIRECTUS_ADMIN_EMAIL:          ${{ secrets.DIRECTUS_ADMIN_EMAIL }}
-      DIRECTUS_ADMIN_PASSWORD:       ${{ secrets.DIRECTUS_ADMIN_PASSWORD }}
+      DIRECTUS_KEY:                  ${{ secrets.DIRECTUS_KEY || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_KEY || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_KEY || secrets.TESTING_DIRECTUS_KEY || secrets.DIRECTUS_KEY)) }}
+      DIRECTUS_SECRET:               ${{ secrets.DIRECTUS_SECRET || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_SECRET || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_SECRET || secrets.TESTING_DIRECTUS_SECRET || secrets.DIRECTUS_SECRET)) }}
+      DIRECTUS_ADMIN_EMAIL:          ${{ secrets.DIRECTUS_ADMIN_EMAIL || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_ADMIN_EMAIL || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_ADMIN_EMAIL || secrets.TESTING_DIRECTUS_ADMIN_EMAIL || secrets.DIRECTUS_ADMIN_EMAIL)) }}
+      DIRECTUS_ADMIN_PASSWORD:       ${{ secrets.DIRECTUS_ADMIN_PASSWORD || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_ADMIN_PASSWORD || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_ADMIN_PASSWORD || secrets.TESTING_DIRECTUS_ADMIN_PASSWORD || secrets.DIRECTUS_ADMIN_PASSWORD)) }}
      DIRECTUS_DB_NAME:              ${{ secrets.DIRECTUS_DB_NAME || 'directus' }}
      DIRECTUS_DB_USER:              ${{ secrets.DIRECTUS_DB_USER || 'directus' }}
-      DIRECTUS_DB_PASSWORD:          ${{ secrets.DIRECTUS_DB_PASSWORD }}
-      DIRECTUS_API_TOKEN:            ${{ secrets.DIRECTUS_API_TOKEN }}
+      DIRECTUS_DB_PASSWORD:          ${{ secrets.DIRECTUS_DB_PASSWORD || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_DB_PASSWORD || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_DB_PASSWORD || secrets.TESTING_DIRECTUS_DB_PASSWORD || secrets.DIRECTUS_DB_PASSWORD)) }}
+      DIRECTUS_API_TOKEN:            ${{ secrets.DIRECTUS_API_TOKEN || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_API_TOKEN || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_API_TOKEN || secrets.TESTING_DIRECTUS_API_TOKEN || secrets.DIRECTUS_API_TOKEN)) }}
+      GATEKEEPER_PASSWORD:           ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1

      - name: 🚀 Deploy to ${{ env.TARGET }}
+        shell: bash
        run: |
          echo "Deploying $TARGET → $IMAGE_TAG"

@@ -244,9 +272,11 @@ jobs:
          # Generated by CI - $TARGET - $(date -u)
          NODE_ENV=production
          NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
+          NEXT_PUBLIC_TARGET=$TARGET
          NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
-          NEXT_PUBLIC_UMAMI_SCRIPT_URL=$NEXT_PUBLIC_UMAMI_SCRIPT_URL
+          UMAMI_API_ENDPOINT=$UMAMI_API_ENDPOINT
          SENTRY_DSN=$SENTRY_DSN
+          LOG_LEVEL=$( [[ "$TARGET" == "testing" || "$TARGET" == "development" ]] && echo "debug" || echo "info" )
          MAIL_HOST=$MAIL_HOST
          MAIL_PORT=$MAIL_PORT
          MAIL_USERNAME=$MAIL_USERNAME
@@ -265,26 +295,48 @@ jobs:
          DIRECTUS_DB_USER=$DIRECTUS_DB_USER
          DIRECTUS_DB_PASSWORD=$DIRECTUS_DB_PASSWORD
          DIRECTUS_API_TOKEN=$DIRECTUS_API_TOKEN
+          INTERNAL_DIRECTUS_URL=http://directus:8055
+          GATEKEEPER_PASSWORD=$GATEKEEPER_PASSWORD

+          TARGET=$TARGET
+          SENTRY_ENVIRONMENT=$TARGET
          IMAGE_TAG=$IMAGE_TAG
          TRAEFIK_HOST=$TRAEFIK_HOST
          ENV_FILE=$ENV_FILE
+          AUTH_MIDDLEWARE=$( [[ "$TARGET" == "production" ]] && echo "compress" || echo "${PROJECT_NAME}-auth,compress" )
+          PROJECT_NAME=$PROJECT_NAME
+          COOKIE_DOMAIN=.$(echo $NEXT_PUBLIC_BASE_URL | sed 's|https://||')
          EOF

+          # 1. Cleanup and Create Directories on server BEFORE SCP
+          ssh -o StrictHostKeyChecking=accept-new root@alpha.mintel.me bash << 'EOF'
+            set -e
+            mkdir -p /home/deploy/sites/klz-cables.com/varnish
+            mkdir -p /home/deploy/sites/klz-cables.com/directus/uploads /home/deploy/sites/klz-cables.com/directus/extensions
+            if [ -d "/home/deploy/sites/klz-cables.com/varnish/default.vcl" ]; then
+              echo "🧹 Removing directory 'varnish/default.vcl' created by Docker..."
+              rm -rf /home/deploy/sites/klz-cables.com/varnish/default.vcl
+            fi
+            chown -R deploy:deploy /home/deploy/sites/klz-cables.com/directus /home/deploy/sites/klz-cables.com/varnish
+          EOF
+
+          # 2. Transfer files
          scp -o StrictHostKeyChecking=accept-new /tmp/klz-cables.env root@alpha.mintel.me:/home/deploy/sites/klz-cables.com/$ENV_FILE
          scp -o StrictHostKeyChecking=accept-new docker-compose.yml root@alpha.mintel.me:/home/deploy/sites/klz-cables.com/docker-compose.yml
+          scp -r -o StrictHostKeyChecking=accept-new varnish root@alpha.mintel.me:/home/deploy/sites/klz-cables.com/

          ssh -o StrictHostKeyChecking=accept-new root@alpha.mintel.me IMAGE_TAG="$IMAGE_TAG" ENV_FILE="$ENV_FILE" PROJECT_NAME="$PROJECT_NAME" bash << 'EOF'
            set -e
            cd /home/deploy/sites/klz-cables.com
            chmod 600 "$ENV_FILE"
            chown deploy:deploy "$ENV_FILE"
+
            echo "${{ secrets.REGISTRY_PASS }}" | docker login registry.infra.mintel.me -u "${{ secrets.REGISTRY_USER }}" --password-stdin
            echo "→ Pulling image: $IMAGE_TAG"
            docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" pull
            echo "→ Starting containers..."
            docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" up -d --remove-orphans
-            docker system prune -f --filter "until=168h"
+            docker system prune -f --filter "until=24h"
            echo "→ Waiting 15s for warmup..."
            sleep 15
            echo "→ Container status:"
@@ -294,15 +346,125 @@ jobs:
              docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" logs --tail=150
              exit 1
            fi
+            
+            echo "→ Verifying Varnish Backend Health..."
+            docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" exec -T varnish varnishadm backend.list
+            if ! docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" exec -T varnish varnishadm backend.list | grep -q "healthy"; then
+              echo "❌ Fehler: Varnish Backend ist SICK!"
+              docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" logs varnish
+              exit 1
+            fi
+            echo "✅ Varnish Backend ist Healthy."

  # ──────────────────────────────────────────────────────────────────────────────
-  # JOB 5: Notifications
+  # JOB 5: PageSpeed Test
+  # ──────────────────────────────────────────────────────────────────────────────
+  pagespeed:
+    name: ⚡ PageSpeed
+    needs: [prepare, deploy]
+    if: |
+      always() && 
+      needs.prepare.outputs.target != 'skip' &&
+      needs.deploy.result == 'success' && 
+      github.event.inputs.skip_long_checks != 'true'
+    runs-on: docker
+    container:
+      image: catthehacker/ubuntu:act-latest
+    # outputs:
+    #   report_url: ${{ steps.save.outputs.report_url }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        run: npm ci --legacy-peer-deps
+
+      - name: 🔍 Install Chromium (Native & ARM64)
+        run: |
+          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"
+            
+            # Multi-method Key Fetch
+            SUCCESS=false
+            echo "Fetching key $KEY_ID..."
+            
+            # Method 1: gpg --recv-keys (standard)
+            for server in "hkp://keyserver.ubuntu.com:80" "hkp://keyserver.ubuntu.com:11371"; do
+              if gpg --no-default-keyring --keyring /tmp/xtradeb.gpg --keyserver "$server" --recv-keys "$KEY_ID"; then
+                gpg --no-default-keyring --keyring /tmp/xtradeb.gpg --export > /etc/apt/keyrings/xtradeb.gpg
+                SUCCESS=true && break
+              fi
+            done
+            
+            # Method 2: Direct wget (fallback)
+            if [ "$SUCCESS" = false ]; then
+              wget -qO- "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x$KEY_ID" | gpg --dearmor > /etc/apt/keyrings/xtradeb.gpg && SUCCESS=true
+            fi
+            
+            if [ "$SUCCESS" = true ]; then
+              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
+            else
+              echo "⚠️ GPG fetch failed, using legacy apt-key as last resort..."
+              apt-key adv --keyserver keyserver.ubuntu.com --recv-keys "$KEY_ID" || true
+              echo "deb http://ppa.launchpad.net/xtradeb/apps/ubuntu $CODENAME main" > /etc/apt/sources.list.d/xtradeb-ppa.list
+            fi
+            
+            # 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 || apt-get install -y chromium-browser
+          fi
+          
+          # Force clean paths (remove existing dead links/files if they are snap wrappers)
+          rm -f /usr/bin/google-chrome /usr/bin/chromium-browser
+          [ -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
+          
+          echo "✅ Binary check:"
+          ls -l /usr/bin/chromium* /usr/bin/google-chrome || true
+        continue-on-error: true
+
+      - name: 🧪 Run PageSpeed (Lighthouse)
+        env:
+          NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_base_url }}
+          GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'klz2026' }}
+          PAGESPEED_LIMIT: 8
+          PUPPETEER_EXECUTABLE_PATH: /usr/bin/chromium
+          CHROME_PATH: /usr/bin/chromium
+        run: npm run pagespeed:test
+
+
+
+  # ──────────────────────────────────────────────────────────────────────────────
+  # JOB 6: Notifications
  # ──────────────────────────────────────────────────────────────────────────────
  notifications:
    name: 🔔 Notifications
-    needs: [prepare, qa, build, deploy]
+    needs: [prepare, qa, build-app, deploy, pagespeed]
    if: always()
    runs-on: docker
+    container:
+      image: catthehacker/ubuntu:act-latest
    steps:
      - name: 📊 Deployment Summary
        run: |
@@ -325,7 +487,12 @@ jobs:
            -F "priority=4" || true

      - name: 🔔 Gotify - Failure
-        if: needs.deploy.result == 'failure' || needs.build.result == 'failure' || needs.qa.result == 'failure'
+        if: |
+          needs.prepare.result == 'failure' ||
+          needs.qa.result == 'failure' ||
+          needs.build-app.result == 'failure' ||
+          needs.deploy.result == 'failure' ||
+          needs.pagespeed.result == 'failure'
        run: |
          curl -s -k -X POST "${{ secrets.GOTIFY_URL }}/message?token=${{ secrets.GOTIFY_TOKEN }}" \
            -F "title=❌ Deployment FEHLGESCHLAGEN – ${{ needs.prepare.outputs.target || 'unknown' }}" \
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@@ -0,0 +1 @@
+npx --no -- commitlint --edit "$1"
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -0,0 +1 @@
+npx lint-staged
--- a/.lintstagedrc.js
+++ b/.lintstagedrc.js
@@ -0,0 +1,11 @@
+const path = require('path');
+
+const buildEslintCommand = (filenames) =>
+  `next lint --fix --file ${filenames
+    .map((f) => path.relative(process.cwd(), f))
+    .join(' --file ')}`;
+
+module.exports = {
+  '*.{js,jsx,ts,tsx}': [buildEslintCommand, 'prettier --write'],
+  '*.{json,md,css,scss}': ['prettier --write'],
+};
--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,7 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "all",
+  "printWidth": 100
+}
--- a/11
+++ b/11
@@ -8,7 +8,7 @@ WORKDIR /app

 # Install dependencies based on the preferred package manager
 COPY package.json package-lock.json* ./
-RUN --mount=type=cache,target=/root/.npm npm ci
+RUN --mount=type=cache,target=/root/.npm npm ci --legacy-peer-deps


 # Rebuild the source code only when needed
@@ -25,17 +25,22 @@ ENV NEXT_TELEMETRY_DISABLED=1
 # Build-time environment variables for Next.js
 # These are baked into the client bundle during build
 ARG NEXT_PUBLIC_BASE_URL
+ARG NEXT_PUBLIC_BASE_URL
 ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
+ARG UMAMI_API_ENDPOINT
+ARG UMAMI_SCRIPT_URL
 ARG NEXT_PUBLIC_UMAMI_SCRIPT_URL
+ARG NEXT_PUBLIC_TARGET
 ARG DIRECTUS_URL

 ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
 ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
-ENV NEXT_PUBLIC_UMAMI_SCRIPT_URL=$NEXT_PUBLIC_UMAMI_SCRIPT_URL
+ENV UMAMI_API_ENDPOINT=${UMAMI_API_ENDPOINT:-${UMAMI_SCRIPT_URL:-$NEXT_PUBLIC_UMAMI_SCRIPT_URL}}
+ENV NEXT_PUBLIC_TARGET=$NEXT_PUBLIC_TARGET
 ENV DIRECTUS_URL=$DIRECTUS_URL

 # Validate environment variables during build
-RUN npx tsx scripts/validate-env.ts
+RUN SKIP_RUNTIME_ENV_VALIDATION=true npx tsx scripts/validate-env.ts

 RUN --mount=type=cache,target=/app/.next/cache npm run build

--- a/README.md
+++ b/README.md
@@ -5,11 +5,13 @@ A complete WordPress to Next.js static site migration for KLZ Cables, transformi
 ## 🚀 Quick Start

 ### Prerequisites
- Node.js 18+ 
+
+- Node.js 18+
 - npm or yarn

 ### Installation
-```bash
+
+````bash
 # Install dependencies
 npm install --legacy-peer-deps

@@ -42,11 +44,12 @@ npm run cms:logs

 # Stop the CMS
 npm run cms:stop
-```
+````

 Once running, you can access the Strapi admin panel at `http://localhost:1337/admin`.

 ### 🔄 Data & Migration
+
 To sync data or migrate existing content:

 ```bash
@@ -61,6 +64,7 @@ npm run cms:migrate
 ```

 ### Environment Variables
+
 ```bash
 # .env
 SITE_URL=https://klz-cables.com
@@ -69,8 +73,8 @@ TURNSTILE_SITE_KEY=your_turnstile_key
 TURNSTILE_SECRET_KEY=your_turnstile_secret

 # Umami
-NEXT_PUBLIC_UMAMI_WEBSITE_ID=your_umami_website_id
-NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
+UMAMI_WEBSITE_ID=your_umami_website_id
+UMAMI_API_ENDPOINT=https://analytics.infra.mintel.me

 # GlitchTip (Sentry compatible)
 SENTRY_DSN=https://PUBLIC_KEY@errors.infra.mintel.me/PROJECT_ID
@@ -81,6 +85,7 @@ NEXT_PUBLIC_SENTRY_DSN=https://PUBLIC_KEY@errors.infra.mintel.me/PROJECT_ID
 ## 📊 Project Overview

 ### Migration Statistics
+
 - **Content Exported**: 141 items
  - 18 pages (9 EN + 9 DE)
  - 59 posts (29 EN + 30 DE)
@@ -91,6 +96,7 @@ NEXT_PUBLIC_SENTRY_DSN=https://PUBLIC_KEY@errors.infra.mintel.me/PROJECT_ID
 - **Translation Pairs**: 16

 ### Performance Benefits
+
 - **Before**: Dynamic WordPress with database queries
 - **After**: Static HTML with CDN delivery
 - **Load Time**: <100ms (vs 500ms+)
@@ -99,6 +105,7 @@ NEXT_PUBLIC_SENTRY_DSN=https://PUBLIC_KEY@errors.infra.mintel.me/PROJECT_ID
 ## 🏗️ Architecture

 ### Tech Stack
+
 - **Framework**: Next.js 14 (App Router)
 - **Language**: TypeScript
 - **Styling**: SCSS
@@ -109,6 +116,7 @@ NEXT_PUBLIC_SENTRY_DSN=https://PUBLIC_KEY@errors.infra.mintel.me/PROJECT_ID
 - **CAPTCHA**: Cloudflare Turnstile

 ### Project Structure
+
 ```
 app/
 ├── layout.tsx          # Root layout
@@ -163,6 +171,7 @@ scripts/
 ## 🎯 Features

 ### ✅ Implemented
+
 - **Multi-language**: EN/DE with `/de/` prefix routing
 - **Contact Forms**: Resend integration with validation
 - **GDPR Compliance**: Cookie consent banner
@@ -175,12 +184,14 @@ scripts/
 - **Asset Management**: WordPress → local path mapping

 ### 🔄 In Progress
+
 - Analytics integration (consent-based)
 - Turnstile CAPTCHA
 - Build testing
 - Deployment configuration

 ### 📝 Remaining
+
 - Performance optimization
 - Final QA testing
 - Documentation updates
@@ -188,6 +199,7 @@ scripts/
 ## 📝 Content Management

 ### Data Export
+
 ```bash
 # Export from WordPress
 npm run data:export
@@ -203,6 +215,7 @@ npm run data:improve-mapping
 ```

 ### Adding New Content
+
 1. Export new content from WordPress
 2. Process the data
 3. Rebuild the site
@@ -210,17 +223,20 @@ npm run data:improve-mapping
 ## 🎨 Design System

 ### Colors
+
 - Primary: `#0066cc` (KLZ Blue)
 - Secondary: `#00a896` (Teal)
 - Text: `#1a1a1a`
 - Background: `#f8f9fa`

 ### Typography
+
 - Font: Inter
 - Base: 16px
 - Scale: 1.25 (Major Third)

 ### Layout
+
 - Max width: 1200px
 - Responsive grid
 - Mobile-first
@@ -228,6 +244,7 @@ npm run data:improve-mapping
 ## 🔧 API Endpoints

 ### Contact Form
+
 ```
 POST /api/contact
 {
@@ -239,11 +256,13 @@ POST /api/contact
 ```

 ### Sitemap
+
 ```
 GET /sitemap.xml
 ```

 ### Robots
+
 ```
 GET /robots.txt
 ```
@@ -261,6 +280,7 @@ The project uses **Gitea Actions** for CI/CD. Every push to `main` or `staging`
 **Workflow**: `.gitea/workflows/deploy.yml`

 **Branch Deployments**:
+
 - `main` branch: Deploys to production using `.env.prod`
 - `staging` branch: Deploys to staging using `.env.staging`

@@ -268,12 +288,13 @@ The project uses **Gitea Actions** for CI/CD. Every push to `main` or `staging`
 The CI/CD workflow supports `STAGING_`-prefixed secrets (e.g., `STAGING_NEXT_PUBLIC_BASE_URL`) to override default secrets when deploying the `staging` branch.

 **Required Secrets** (configure in Gitea repository settings):
+
 - `REGISTRY_USER` - Docker registry username
 - `REGISTRY_PASS` - Docker registry password
 - `ALPHA_SSH_KEY` - SSH private key for deployment
 - `NEXT_PUBLIC_BASE_URL` - Application base URL (e.g., `https://klz-cables.com`)
- `NEXT_PUBLIC_UMAMI_WEBSITE_ID` - Analytics ID
- `NEXT_PUBLIC_UMAMI_SCRIPT_URL` - Analytics script URL
+- `UMAMI_WEBSITE_ID` - Analytics ID
+- `UMAMI_API_ENDPOINT` - Analytics API endpoint (formerly NEXT_PUBLIC_UMAMI_SCRIPT_URL)
 - `SENTRY_DSN` - Error tracking DSN
 - `MAIL_HOST`, `MAIL_PORT`, `MAIL_USERNAME`, `MAIL_PASSWORD`, `MAIL_FROM`, `MAIL_RECIPIENTS` - Email configuration

@@ -293,6 +314,7 @@ docker image prune -f
 ```

 Or use the convenience script:
+
 ```bash
 bash scripts/deploy-webhook.sh
 ```
@@ -304,11 +326,13 @@ Client → Traefik (TLS) → Next.js App
 ```

 **Domains**:
+
 - `klz-cables.com` - Production
 - `www.klz-cables.com` - Production (www)
 - `staging.klz-cables.com` - Staging

 **Services**:
+
 - `app`: Next.js application (port 3000)
 - `traefik`: Reverse proxy (external)

@@ -317,25 +341,30 @@ For detailed deployment documentation, see [`docs/DEPLOYMENT.md`](docs/DEPLOYMEN
 ## 📈 Performance

 ### Build Time
+
 - **Target**: < 2 minutes
 - **Current**: ~1-2 minutes

 ### Page Load
+
 - **Target**: < 100ms
 - **Current**: Static HTML from CDN

 ### Bundle Size
+
 - **Target**: < 100KB gzipped
 - **Current**: Optimized with code splitting

 ## 🔒 Security

 ### Environment Variables
+
 - Never commit `.env` file
 - Rotate keys regularly
 - Use secrets in deployment platform

 ### Form Security
+
 - Email validation
 - Rate limiting (recommended)
 - Turnstile CAPTCHA (pending)
@@ -343,6 +372,7 @@ For detailed deployment documentation, see [`docs/DEPLOYMENT.md`](docs/DEPLOYMEN
 ## 🎓 WordPress Specifics

 ### WPBakery Shortcodes Removed
+
 - `[vc_row]`, `[vc_column]`, `[vc_column_text]`
 - `[nectar_*]` (Salient theme)
 - `[image_with_animation]`
@@ -350,13 +380,16 @@ For detailed deployment documentation, see [`docs/DEPLOYMENT.md`](docs/DEPLOYMEN
 - `[divider]`

 ### HTML Sanitization
+
 - Removes inline event handlers
 - Strips scripts
 - Normalizes classes
 - Preserves structure

 ### Asset Mapping
+
 WordPress URLs → Local paths:
+
 ```
 https://klz-cables.com/wp-content/uploads/... → /media/...
 ```
@@ -364,11 +397,13 @@ https://klz-cables.com/wp-content/uploads/... → /media/...
 ## 📚 Documentation

 ### Internal
+
 - `PROJECT_STRUCTURE.md` - Detailed structure
 - `IMPLEMENTATION_SUMMARY.md` - Progress tracking
 - `FINAL_SUMMARY.md` - Complete overview

 ### External
+
 - [Next.js Docs](https://nextjs.org/docs)
 - [WordPress REST API](https://developer.wordpress.org/rest-api/)
 - [Resend Docs](https://resend.com/docs)
@@ -379,17 +414,20 @@ https://klz-cables.com/wp-content/uploads/... → /media/...
 ### Common Issues

 **TypeScript Errors**
+
 - The TypeScript errors shown in the editor are expected
 - They occur because modules reference each other
 - The build process resolves these correctly
 - Run `npm run build` to verify

 **Build Failures**
+
 - Check environment variables
 - Verify data files exist
 - Clear `.next` cache: `rm -rf .next`

 **Missing Modules**
+
 - Run `npm install --legacy-peer-deps`
 - Check `package.json` dependencies

@@ -404,11 +442,12 @@ https://klz-cables.com/wp-content/uploads/... → /media/...
 ✅ **i18n**: Multi-language support  
 ✅ **SEO**: Metadata and sitemaps  
 ✅ **Compatibility**: WPBakery content handled  
-✅ **Media**: All images downloaded  
+✅ **Media**: All images downloaded

 ## 📞 Support

 For issues or questions:
+
 1. Check the documentation
 2. Review the troubleshooting section
 3. Check environment variables
--- a/app/[locale]/[slug]/page.tsx
+++ b/app/[locale]/[slug]/page.tsx
@@ -6,6 +6,7 @@ import { Metadata } from 'next';
 import { getPageBySlug, getAllPages } from '@/lib/pages';
 import { mdxComponents } from '@/components/blog/MDXComponents';
 import { getOGImageMetadata } from '@/lib/metadata';
+import { SITE_URL } from '@/lib/schema';

 interface PageProps {
  params: {
@@ -30,7 +31,7 @@ export async function generateStaticParams() {

 export async function generateMetadata({ params: { locale, slug } }: PageProps): Promise<Metadata> {
  const pageData = await getPageBySlug(slug, locale);
-  
+
  if (!pageData) return {};

  return {
@@ -39,15 +40,15 @@ export async function generateMetadata({ params: { locale, slug } }: PageProps):
    alternates: {
      canonical: `/${locale}/${slug}`,
      languages: {
-        'de': `/de/${slug}`,
-        'en': `/en/${slug}`,
+        de: `/de/${slug}`,
+        en: `/en/${slug}`,
        'x-default': `/en/${slug}`,
      },
    },
    openGraph: {
      title: `${pageData.frontmatter.title} | KLZ Cables`,
      description: pageData.frontmatter.excerpt || '',
-      url: `https://klz-cables.com/${locale}/${slug}`,
+      url: `${SITE_URL}/${locale}/${slug}`,
      images: getOGImageMetadata(slug, pageData.frontmatter.title, locale),
    },
    twitter: {
@@ -75,7 +76,9 @@ export default async function StandardPage({ params: { locale, slug } }: PagePro
        </div>
        <Container className="relative z-10">
          <div className="max-w-4xl animate-slide-up">
-            <Badge variant="accent" className="mb-4 md:mb-6">{t('badge')}</Badge>
+            <Badge variant="accent" className="mb-4 md:mb-6">
+              {t('badge')}
+            </Badge>
            <Heading level={1} className="text-white mb-0">
              {pageData.frontmatter.title}
            </Heading>
@@ -106,9 +109,14 @@ export default async function StandardPage({ params: { locale, slug } }: PagePro
            <div className="relative z-10 max-w-2xl">
              <h3 className="text-2xl md:text-3xl font-bold mb-4">{t('needHelp')}</h3>
              <p className="text-lg text-white/70 mb-8">{t('supportTeamAvailable')}</p>
-              <a href={`/${locale}/contact`} className="inline-flex items-center px-8 py-4 bg-accent text-primary-dark font-bold rounded-full hover:bg-white transition-all duration-300 group/link">
-                {t('contactUs')} 
-                <span className="ml-2 transition-transform group-hover/link:translate-x-1">&rarr;</span>
+              <a
+                href={`/${locale}/contact`}
+                className="inline-flex items-center px-8 py-4 bg-accent text-primary-dark font-bold rounded-full hover:bg-white transition-all duration-300 group/link"
+              >
+                {t('contactUs')}
+                <span className="ml-2 transition-transform group-hover/link:translate-x-1">
+                  &rarr;
+                </span>
              </a>
            </div>
          </div>
@@ -116,4 +124,4 @@ export default async function StandardPage({ params: { locale, slug } }: PagePro
      </div>
    </div>
  );
-}
+}
--- a/app/[locale]/blog/[slug]/opengraph-image.tsx
+++ b/app/[locale]/blog/[slug]/opengraph-image.tsx
@@ -2,10 +2,15 @@ import { ImageResponse } from 'next/og';
 import { getPostBySlug } from '@/lib/blog';
 import { OGImageTemplate } from '@/components/OGImageTemplate';
 import { getOgFonts, OG_IMAGE_SIZE } from '@/lib/og-helper';
+import { SITE_URL } from '@/lib/schema';

 export const runtime = 'nodejs';

-export default async function Image({ params: { locale, slug } }: { params: { locale: string, slug: string } }) {
+export default async function Image({
+  params: { locale, slug },
+}: {
+  params: { locale: string; slug: string };
+}) {
  const post = await getPostBySlug(slug, locale);

  if (!post) {
@@ -19,24 +24,21 @@ export default async function Image({ params: { locale, slug } }: { params: { lo
  // but if we are in nodejs runtime, we could potentially read from disk.
  // For now, let's just make sure it's absolute.
  const featuredImage = post.frontmatter.featuredImage
-    ? (post.frontmatter.featuredImage.startsWith('http')
+    ? post.frontmatter.featuredImage.startsWith('http')
      ? post.frontmatter.featuredImage
-      : `https://klz-cables.com${post.frontmatter.featuredImage}`)
+      : `${SITE_URL}${post.frontmatter.featuredImage}`
    : undefined;

  return new ImageResponse(
-    (
-      <OGImageTemplate
-        title={post.frontmatter.title}
-        description={post.frontmatter.excerpt}
-        label={post.frontmatter.category || 'Blog'}
-        image={featuredImage}
-      />
-    ),
+    <OGImageTemplate
+      title={post.frontmatter.title}
+      description={post.frontmatter.excerpt}
+      label={post.frontmatter.category || 'Blog'}
+      image={featuredImage}
+    />,
    {
      ...OG_IMAGE_SIZE,
      fonts,
-    }
+    },
  );
 }
-
--- a/app/[locale]/blog/[slug]/page.tsx
+++ b/app/[locale]/blog/[slug]/page.tsx
@@ -20,9 +20,11 @@ interface BlogPostProps {
  };
 }

-export async function generateMetadata({ params: { locale, slug } }: BlogPostProps): Promise<Metadata> {
+export async function generateMetadata({
+  params: { locale, slug },
+}: BlogPostProps): Promise<Metadata> {
  const post = await getPostBySlug(slug, locale);
-  
+
  if (!post) return {};

  const description = post.frontmatter.excerpt || '';
@@ -32,8 +34,8 @@ export async function generateMetadata({ params: { locale, slug } }: BlogPostPro
    alternates: {
      canonical: `/${locale}/blog/${slug}`,
      languages: {
-        'de': `/de/blog/${slug}`,
-        'en': `/en/blog/${slug}`,
+        de: `/de/blog/${slug}`,
+        en: `/en/blog/${slug}`,
        'x-default': `/en/blog/${slug}`,
      },
    },
@@ -43,7 +45,7 @@ export async function generateMetadata({ params: { locale, slug } }: BlogPostPro
      type: 'article',
      publishedTime: post.frontmatter.date,
      authors: ['KLZ Cables'],
-      url: `https://klz-cables.com/${locale}/blog/${slug}`,
+      url: `${SITE_URL}/${locale}/blog/${slug}`,
      images: getOGImageMetadata(`blog/${slug}`, post.frontmatter.title, locale),
    },
    twitter: {
@@ -66,16 +68,15 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro

  return (
    <article className="bg-white min-h-screen font-sans selection:bg-primary/10 selection:text-primary">
-      
      {/* Featured Image Header */}
      {post.frontmatter.featuredImage ? (
        <div className="relative w-full h-[70vh] min-h-[500px] overflow-hidden group">
-          <div 
+          <div
            className="absolute inset-0 bg-cover bg-center transition-transform duration-[3s] ease-out scale-110 group-hover:scale-100"
            style={{ backgroundImage: `url(${post.frontmatter.featuredImage})` }}
          />
          <div className="absolute inset-0 bg-gradient-to-t from-neutral-dark 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">
            <div className="container mx-auto px-4">
@@ -87,7 +88,10 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro
                    </span>
                  </div>
                )}
-                <Heading level={1} className="text-white mb-8 drop-shadow-2xl animate-slight-fade-in-from-bottom [animation-delay:200ms]">
+                <Heading
+                  level={1}
+                  className="text-white mb-8 drop-shadow-2xl animate-slight-fade-in-from-bottom [animation-delay:200ms]"
+                >
                  {post.frontmatter.title}
                </Heading>
                <div className="flex flex-wrap items-center gap-6 text-white/80 text-sm md:text-base font-medium animate-slight-fade-in-from-bottom [animation-delay:400ms]">
@@ -95,7 +99,7 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro
                    {new Date(post.frontmatter.date).toLocaleDateString(locale, {
                      year: 'numeric',
                      month: 'long',
-                      day: 'numeric'
+                      day: 'numeric',
                    })}
                  </time>
                  <span className="w-1 h-1 bg-white/30 rounded-full" />
@@ -123,7 +127,7 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro
                {new Date(post.frontmatter.date).toLocaleDateString(locale, {
                  year: 'numeric',
                  month: 'long',
-                  day: 'numeric'
+                  day: 'numeric',
                })}
              </time>
              <span className="w-1 h-1 bg-neutral-300 rounded-full" />
@@ -168,8 +172,18 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro
                href={`/${locale}/blog`}
                className="inline-flex items-center gap-3 text-text-secondary hover:text-primary font-bold text-sm uppercase tracking-widest transition-all group"
              >
-                <svg className="w-5 h-5 transition-transform group-hover:-translate-x-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 19l-7-7 7-7" />
+                <svg
+                  className="w-5 h-5 transition-transform group-hover:-translate-x-2"
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth={2}
+                    d="M15 19l-7-7 7-7"
+                  />
                </svg>
                {locale === 'de' ? 'Zurück zur Übersicht' : 'Back to Overview'}
              </Link>
@@ -188,57 +202,63 @@ export default async function BlogPost({ params: { locale, slug } }: BlogPostPro
      {/* Structured Data */}
      <JsonLd
        id={`jsonld-${slug}`}
-        data={{
-          '@context': 'https://schema.org',
-          '@type': 'BlogPosting',
-          headline: post.frontmatter.title,
-          datePublished: post.frontmatter.date,
-          dateModified: post.frontmatter.date,
-          image: post.frontmatter.featuredImage ? `https://klz-cables.com${post.frontmatter.featuredImage}` : undefined,
-          author: {
-            '@type': 'Organization',
-            name: 'KLZ Cables',
-            url: 'https://klz-cables.com',
-            logo: 'https://klz-cables.com/logo-blue.svg'
-          },
-          publisher: {
-            '@type': 'Organization',
-            name: 'KLZ Cables',
-            logo: {
-              '@type': 'ImageObject',
-              url: 'https://klz-cables.com/logo-blue.svg',
+        data={
+          {
+            '@context': 'https://schema.org',
+            '@type': 'BlogPosting',
+            headline: post.frontmatter.title,
+            datePublished: post.frontmatter.date,
+            dateModified: post.frontmatter.date,
+            image: post.frontmatter.featuredImage
+              ? `${SITE_URL}${post.frontmatter.featuredImage}`
+              : undefined,
+            author: {
+              '@type': 'Organization',
+              name: 'KLZ Cables',
+              url: SITE_URL,
+              logo: `${SITE_URL}/logo-blue.svg`,
            },
-          },
-          description: post.frontmatter.excerpt,
-          mainEntityOfPage: {
-            '@type': 'WebPage',
-            '@id': `https://klz-cables.com/${locale}/blog/${slug}`,
-          },
-          articleSection: post.frontmatter.category,
-          wordCount: post.content.split(/\s+/).length,
-          timeRequired: `PT${getReadingTime(post.content)}M`
-        } as any}
+            publisher: {
+              '@type': 'Organization',
+              name: 'KLZ Cables',
+              logo: {
+                '@type': 'ImageObject',
+                url: `${SITE_URL}/logo-blue.svg`,
+              },
+            },
+            description: post.frontmatter.excerpt,
+            mainEntityOfPage: {
+              '@type': 'WebPage',
+              '@id': `${SITE_URL}/${locale}/blog/${slug}`,
+            },
+            articleSection: post.frontmatter.category,
+            wordCount: post.content.split(/\s+/).length,
+            timeRequired: `PT${getReadingTime(post.content)}M`,
+          } as any
+        }
      />
      <JsonLd
        id={`breadcrumb-${slug}`}
-        data={{
-          '@context': 'https://schema.org',
-          '@type': 'BreadcrumbList',
-          itemListElement: [
-            {
-              '@type': 'ListItem',
-              position: 1,
-              name: 'Blog',
-              item: `https://klz-cables.com/${locale}/blog`,
-            },
-            {
-              '@type': 'ListItem',
-              position: 2,
-              name: post.frontmatter.title,
-              item: `https://klz-cables.com/${locale}/blog/${slug}`,
-            },
-          ],
-        } as any}
+        data={
+          {
+            '@context': 'https://schema.org',
+            '@type': 'BreadcrumbList',
+            itemListElement: [
+              {
+                '@type': 'ListItem',
+                position: 1,
+                name: 'Blog',
+                item: `${SITE_URL}/${locale}/blog`,
+              },
+              {
+                '@type': 'ListItem',
+                position: 2,
+                name: post.frontmatter.title,
+                item: `${SITE_URL}/${locale}/blog/${slug}`,
+              },
+            ],
+          } as any
+        }
      />
    </article>
  );
--- a/app/[locale]/blog/page.tsx
+++ b/app/[locale]/blog/page.tsx
@@ -4,6 +4,7 @@ import { Section, Container, Heading, Card, Badge, Button } from '@/components/u
 import Reveal from '@/components/Reveal';
 import { getTranslations } from 'next-intl/server';
 import { getOGImageMetadata } from '@/lib/metadata';
+import { SITE_URL } from '@/lib/schema';

 interface BlogIndexProps {
  params: {
@@ -19,15 +20,15 @@ export async function generateMetadata({ params: { locale } }: BlogIndexProps) {
    alternates: {
      canonical: `/${locale}/blog`,
      languages: {
-        'de': '/de/blog',
-        'en': '/en/blog',
+        de: '/de/blog',
+        en: '/en/blog',
        'x-default': '/en/blog',
      },
    },
    openGraph: {
      title: `${t('title')} | KLZ Cables`,
      description: t('description'),
-      url: `https://klz-cables.com/${locale}/blog`,
+      url: `${SITE_URL}/${locale}/blog`,
      images: getOGImageMetadata('blog', t('title'), locale),
    },
    twitter: {
@@ -41,10 +42,10 @@ export async function generateMetadata({ params: { locale } }: BlogIndexProps) {
 export default async function BlogIndex({ params: { locale } }: BlogIndexProps) {
  const t = await getTranslations('Blog');
  const posts = await getAllPosts(locale);
-  
+
  // Sort posts by date descending
-  const sortedPosts = [...posts].sort((a, b) => 
-    new Date(b.frontmatter.date).getTime() - new Date(a.frontmatter.date).getTime()
+  const sortedPosts = [...posts].sort(
+    (a, b) => new Date(b.frontmatter.date).getTime() - new Date(a.frontmatter.date).getTime(),
  );

  const featuredPost = sortedPosts[0];
@@ -65,10 +66,12 @@ export default async function BlogIndex({ params: { locale } }: BlogIndexProps)
              <div className="absolute inset-0 image-overlay-gradient" />
            </>
          )}
-          
+
          <Container className="relative z-10">
            <div className="max-w-4xl animate-slide-up">
-              <Badge variant="saturated" className="mb-4 md:mb-6">{t('featuredPost')}</Badge>
+              <Badge variant="saturated" className="mb-4 md:mb-6">
+                {t('featuredPost')}
+              </Badge>
              {featuredPost && (
                <>
                  <Heading level={1} className="text-white mb-4 md:mb-8">
@@ -77,9 +80,16 @@ export default async function BlogIndex({ params: { locale } }: BlogIndexProps)
                  <p className="text-base md:text-xl text-white/80 mb-6 md:mb-10 line-clamp-2 md:line-clamp-2 max-w-2xl">
                    {featuredPost.frontmatter.excerpt}
                  </p>
-                  <Button href={`/${locale}/blog/${featuredPost.slug}`} variant="accent" size="lg" className="group w-full md:w-auto md:h-16 md:px-10 md:text-xl">
+                  <Button
+                    href={`/${locale}/blog/${featuredPost.slug}`}
+                    variant="accent"
+                    size="lg"
+                    className="group w-full md:w-auto md:h-16 md:px-10 md:text-xl"
+                  >
                    {t('readFullArticle')}
-                    <span className="ml-3 transition-transform group-hover:translate-x-2">&rarr;</span>
+                    <span className="ml-3 transition-transform group-hover:translate-x-2">
+                      &rarr;
+                    </span>
                  </Button>
                </>
              )}
@@ -97,10 +107,30 @@ export default async function BlogIndex({ params: { locale } }: BlogIndexProps)
              </Heading>
              <div className="flex flex-wrap gap-2 md:gap-4">
                {/* Category filters could go here */}
-                <Badge variant="primary" className="cursor-pointer hover:bg-primary hover:text-white transition-colors touch-target px-3 md:px-4">{t('categories.all')}</Badge>
-                <Badge variant="neutral" className="cursor-pointer hover:bg-primary hover:text-white transition-colors touch-target px-3 md:px-4">{t('categories.industry')}</Badge>
-                <Badge variant="neutral" className="cursor-pointer hover:bg-primary hover:text-white transition-colors touch-target px-3 md:px-4">{t('categories.technical')}</Badge>
-                <Badge variant="neutral" className="cursor-pointer hover:bg-primary hover:text-white transition-colors touch-target px-3 md:px-4">{t('categories.sustainability')}</Badge>
+                <Badge
+                  variant="primary"
+                  className="cursor-pointer hover:bg-primary hover:text-white transition-colors touch-target px-3 md:px-4"
+                >
+                  {t('categories.all')}
+                </Badge>
+                <Badge
+                  variant="neutral"
+                  className="cursor-pointer hover:bg-primary hover:text-white transition-colors touch-target px-3 md:px-4"
+                >
+                  {t('categories.industry')}
+                </Badge>
+                <Badge
+                  variant="neutral"
+                  className="cursor-pointer hover:bg-primary hover:text-white transition-colors touch-target px-3 md:px-4"
+                >
+                  {t('categories.technical')}
+                </Badge>
+                <Badge
+                  variant="neutral"
+                  className="cursor-pointer hover:bg-primary hover:text-white transition-colors touch-target px-3 md:px-4"
+                >
+                  {t('categories.sustainability')}
+                </Badge>
              </div>
            </div>
          </Reveal>
@@ -120,7 +150,10 @@ export default async function BlogIndex({ params: { locale } }: BlogIndexProps)
                        />
                        <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-3 left-3 md:top-6 md:left-6 shadow-lg">
+                          <Badge
+                            variant="accent"
+                            className="absolute top-3 left-3 md:top-6 md:left-6 shadow-lg"
+                          >
                            {post.frontmatter.category}
                          </Badge>
                        )}
@@ -131,7 +164,7 @@ export default async function BlogIndex({ params: { locale } }: BlogIndexProps)
                        {new Date(post.frontmatter.date).toLocaleDateString(locale, {
                          year: 'numeric',
                          month: 'long',
-                          day: 'numeric'
+                          day: 'numeric',
                        })}
                      </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-2 leading-tight">
@@ -145,8 +178,18 @@ export default async function BlogIndex({ params: { locale } }: BlogIndexProps)
                          {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">
-                          <svg className="w-4 h-4 md:w-5 md:h-5 transition-transform group-hover:translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17 8l4 4m0 0l-4 4m4-4H3" />
+                          <svg
+                            className="w-4 h-4 md:w-5 md:h-5 transition-transform group-hover:translate-x-1"
+                            fill="none"
+                            stroke="currentColor"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              strokeLinecap="round"
+                              strokeLinejoin="round"
+                              strokeWidth={2}
+                              d="M17 8l4 4m0 0l-4 4m4-4H3"
+                            />
                          </svg>
                        </div>
                      </div>
@@ -156,13 +199,21 @@ export default async function BlogIndex({ params: { locale } }: BlogIndexProps)
              </Reveal>
            ))}
          </div>
-          
+
          {/* Pagination Placeholder */}
          <div className="mt-12 md:mt-24 flex justify-center gap-2 md:gap-4">
-            <Button variant="outline" size="sm" className="md:h-11 md:px-6 md:text-base" disabled>{t('prev')}</Button>
-            <Button variant="primary" size="sm" className="md:h-11 md:px-6 md:text-base">1</Button>
-            <Button variant="outline" size="sm" className="md:h-11 md:px-6 md:text-base">2</Button>
-            <Button variant="outline" size="sm" className="md:h-11 md:px-6 md:text-base">{t('next')}</Button>
+            <Button variant="outline" size="sm" className="md:h-11 md:px-6 md:text-base" disabled>
+              {t('prev')}
+            </Button>
+            <Button variant="primary" size="sm" className="md:h-11 md:px-6 md:text-base">
+              1
+            </Button>
+            <Button variant="outline" size="sm" className="md:h-11 md:px-6 md:text-base">
+              2
+            </Button>
+            <Button variant="outline" size="sm" className="md:h-11 md:px-6 md:text-base">
+              {t('next')}
+            </Button>
          </div>
        </Container>
      </Section>
--- a/app/[locale]/contact/page.tsx
+++ b/app/[locale]/contact/page.tsx
@@ -23,7 +23,9 @@ interface ContactPageProps {
  };
 }

-export async function generateMetadata({ params: { locale } }: ContactPageProps): Promise<Metadata> {
+export async function generateMetadata({
+  params: { locale },
+}: ContactPageProps): Promise<Metadata> {
  const t = await getTranslations({ locale, namespace: 'Contact' });
  const title = t('meta.title') || t('title');
  const description = t('meta.description') || t('subtitle');
@@ -31,7 +33,7 @@ export async function generateMetadata({ params: { locale } }: ContactPageProps)
    title,
    description,
    alternates: {
-      canonical: `https://klz-cables.com/${locale}/contact`,
+      canonical: `${SITE_URL}/${locale}/contact`,
      languages: {
        'de-DE': '/de/contact',
        'en-US': '/en/contact',
@@ -40,7 +42,7 @@ export async function generateMetadata({ params: { locale } }: ContactPageProps)
    openGraph: {
      title: `${title} | KLZ Cables`,
      description,
-      url: `https://klz-cables.com/${locale}/contact`,
+      url: `${SITE_URL}/${locale}/contact`,
      siteName: 'KLZ Cables',
      images: getOGImageMetadata('contact', title, locale),
      locale: `${locale.toUpperCase()}_DE`,
@@ -78,7 +80,7 @@ export default async function ContactPage({ params }: ContactPageProps) {
              '@type': 'ListItem',
              position: 1,
              name: t('title'),
-              item: `https://klz-cables.com/${locale}/contact`,
+              item: `${SITE_URL}/${locale}/contact`,
            },
          ],
        }}
@@ -89,9 +91,9 @@ export default async function ContactPage({ params }: ContactPageProps) {
          '@context': 'https://schema.org',
          '@type': 'LocalBusiness',
          name: 'KLZ Cables',
-          image: 'https://klz-cables.com/logo.png',
-          '@id': 'https://klz-cables.com',
-          url: 'https://klz-cables.com',
+          image: `${SITE_URL}/logo.png`,
+          '@id': SITE_URL,
+          url: SITE_URL,
          address: {
            '@type': 'PostalAddress',
            streetAddress: 'Raiffeisenstraße 22',
@@ -107,20 +109,12 @@ export default async function ContactPage({ params }: ContactPageProps) {
          openingHoursSpecification: [
            {
              '@type': 'OpeningHoursSpecification',
-              dayOfWeek: [
-                'Monday',
-                'Tuesday',
-                'Wednesday',
-                'Thursday',
-                'Friday'
-              ],
+              dayOfWeek: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'],
              opens: '08:00',
-              closes: '17:00'
-            }
+              closes: '17:00',
+            },
          ],
-          sameAs: [
-            'https://www.linkedin.com/company/klz-cables'
-          ]
+          sameAs: ['https://www.linkedin.com/company/klz-cables'],
        }}
      />
      {/* Hero Section */}
@@ -154,36 +148,71 @@ export default async function ContactPage({ params }: ContactPageProps) {
                <div className="space-y-4 md:space-y-8">
                  <div className="flex items-start gap-4 md:gap-6 group">
                    <div className="w-10 h-10 md:w-14 md:h-14 rounded-xl md:rounded-2xl bg-saturated/10 flex items-center justify-center text-saturated group-hover:bg-accent group-hover:text-primary-dark transition-all duration-300 shadow-sm flex-shrink-0">
-                      <svg className="w-5 h-5 md:w-7 md:h-7" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z" />
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 11a3 3 0 11-6 0 3 3 0 016 0z" />
+                      <svg
+                        className="w-5 h-5 md:w-7 md:h-7"
+                        fill="none"
+                        viewBox="0 0 24 24"
+                        stroke="currentColor"
+                      >
+                        <path
+                          strokeLinecap="round"
+                          strokeLinejoin="round"
+                          strokeWidth={2}
+                          d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"
+                        />
+                        <path
+                          strokeLinecap="round"
+                          strokeLinejoin="round"
+                          strokeWidth={2}
+                          d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"
+                        />
                      </svg>
                    </div>
                    <div>
-                      <h4 className="text-base md:text-xl font-bold text-primary mb-1 md:mb-2">{t('info.office')}</h4>
+                      <h4 className="text-base md:text-xl font-bold text-primary mb-1 md:mb-2">
+                        {t('info.office')}
+                      </h4>
                      <p className="text-sm md:text-lg text-text-secondary leading-relaxed whitespace-pre-line">
                        {t('info.address')}
                      </p>
                    </div>
                  </div>

-
                  <div className="flex items-start gap-4 md:gap-6 group">
                    <div className="w-10 h-10 md:w-14 md:h-14 rounded-xl md:rounded-2xl bg-saturated/10 flex items-center justify-center text-saturated group-hover:bg-accent group-hover:text-primary-dark transition-all duration-300 shadow-sm flex-shrink-0">
-                      <svg className="w-5 h-5 md:w-7 md:h-7" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />
+                      <svg
+                        className="w-5 h-5 md:w-7 md:h-7"
+                        fill="none"
+                        viewBox="0 0 24 24"
+                        stroke="currentColor"
+                      >
+                        <path
+                          strokeLinecap="round"
+                          strokeLinejoin="round"
+                          strokeWidth={2}
+                          d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
+                        />
                      </svg>
                    </div>
                    <div>
-                      <h4 className="text-base md:text-xl font-bold text-primary mb-1 md:mb-2">{t('info.email')}</h4>
-                      <a href="mailto:info@klz-cables.com" className="text-sm md:text-lg text-text-secondary hover:text-primary transition-colors font-medium touch-target">info@klz-cables.com</a>
+                      <h4 className="text-base md:text-xl font-bold text-primary mb-1 md:mb-2">
+                        {t('info.email')}
+                      </h4>
+                      <a
+                        href="mailto:info@klz-cables.com"
+                        className="text-sm md:text-lg text-text-secondary hover:text-primary transition-colors font-medium touch-target"
+                      >
+                        info@klz-cables.com
+                      </a>
                    </div>
                  </div>
                </div>
              </div>

              <div className="p-6 md:p-10 bg-white rounded-2xl md:rounded-3xl border border-neutral-medium shadow-sm animate-fade-in">
-                <Heading level={4} className="mb-4 md:mb-6">{t('hours.title')}</Heading>
+                <Heading level={4} className="mb-4 md:mb-6">
+                  {t('hours.title')}
+                </Heading>
                <ul className="space-y-2 md:space-y-4 list-none m-0 p-0">
                  <li className="flex justify-between items-center pb-2 md:pb-4 border-b border-neutral-medium text-sm md:text-base">
                    <span className="font-bold text-primary">{t('hours.weekdays')}</span>
@@ -199,24 +228,28 @@ export default async function ContactPage({ params }: ContactPageProps) {

            {/* Contact Form */}
            <div className="lg:col-span-7">
-              <Suspense fallback={<div className="animate-pulse bg-neutral-medium h-96 rounded-2xl md:rounded-3xl"></div>}>
+              <Suspense
+                fallback={
+                  <div className="animate-pulse bg-neutral-medium h-96 rounded-2xl md:rounded-3xl"></div>
+                }
+              >
                <ContactForm />
              </Suspense>
            </div>
          </div>
        </Container>
      </Section>
-      
+
      {/* Map Section */}
      <section className="h-[300px] md:h-[500px] bg-neutral-medium relative overflow-hidden grayscale hover:grayscale-0 transition-all duration-1000">
-        <Suspense fallback={<div className="h-full w-full bg-neutral-medium animate-pulse flex items-center justify-center">
-          <div className="text-primary font-medium">Loading Map...</div>
-        </div>}>
-          <LeafletMap
-            address={t('info.address')}
-            lat={48.8144}
-            lng={9.4144}
-          />
+        <Suspense
+          fallback={
+            <div className="h-full w-full bg-neutral-medium animate-pulse flex items-center justify-center">
+              <div className="text-primary font-medium">Loading Map...</div>
+            </div>
+          }
+        >
+          <LeafletMap address={t('info.address')} lat={48.8144} lng={9.4144} />
        </Suspense>
      </section>
    </div>
--- a/app/[locale]/layout.tsx
+++ b/app/[locale]/layout.tsx
@@ -2,14 +2,23 @@ import Footer from '@/components/Footer';
 import Header from '@/components/Header';
 import JsonLd from '@/components/JsonLd';
 import AnalyticsProvider from '@/components/analytics/AnalyticsProvider';
+import CMSConnectivityNotice from '@/components/CMSConnectivityNotice';
 import { Metadata, Viewport } from 'next';
 import { NextIntlClientProvider } from 'next-intl';
 import { getMessages } from 'next-intl/server';
 import '../../styles/globals.css';
 import { SITE_URL } from '@/lib/schema';
+import { config } from '@/lib/config';

 export const metadata: Metadata = {
  metadataBase: new URL(SITE_URL),
+  icons: {
+    icon: [
+      { url: '/favicon.ico', sizes: 'any' },
+      { url: '/logo-blue.svg', type: 'image/svg+xml' },
+    ],
+    apple: [{ url: '/apple-touch-icon.png', sizes: '180x180', type: 'image/png' }],
+  },
 };

 export const viewport: Viewport = {
@@ -20,31 +29,30 @@ export const viewport: Viewport = {
  viewportFit: 'cover',
  themeColor: '#001a4d',
 };
- 
+
 export default async function LocaleLayout({
  children,
-  params: {locale}
+  params: { locale },
 }: {
  children: React.ReactNode;
-  params: {locale: string};
+  params: { locale: string };
 }) {
  // Providing all messages to the client
  // side is the easiest way to get started
  const messages = await getMessages();
- 
+
  return (
    <html lang={locale} className="scroll-smooth overflow-x-hidden">
      <body className="flex flex-col min-h-screen font-sans selection:bg-accent selection:text-primary-dark antialiased overflow-x-hidden">
        <NextIntlClientProvider messages={messages} locale={locale}>
          <JsonLd />
          <Header />
-          <main className="flex-grow animate-fade-in overflow-visible">
-            {children}
-          </main>
+          <main className="flex-grow animate-fade-in overflow-visible">{children}</main>
          <Footer />
-          
+          <CMSConnectivityNotice />
+
          {/* Sends pageviews for client-side navigations */}
-          <AnalyticsProvider />
+          <AnalyticsProvider websiteId={config.analytics.umami.websiteId} />
        </NextIntlClientProvider>
      </body>
    </html>
--- a/app/[locale]/page.tsx
+++ b/app/[locale]/page.tsx
@@ -20,25 +20,45 @@ export default function HomePage({ params: { locale } }: { params: { locale: str
    <div className="flex flex-col min-h-screen">
      <JsonLd
        id="breadcrumb-home"
-        data={getBreadcrumbSchema([
-          { name: 'Home', item: `/${locale}` },
-        ])}
+        data={getBreadcrumbSchema([{ name: 'Home', item: `/${locale}` }])}
      />
      <Hero />
-      <Reveal><ProductCategories /></Reveal>
-      <Reveal><WhatWeDo /></Reveal>
-      <Reveal><RecentPosts locale={locale} /></Reveal>
-      <Reveal><Experience /></Reveal>
-      <Reveal><WhyChooseUs /></Reveal>
-      <Reveal><MeetTheTeam /></Reveal>
-      <Reveal><GallerySection /></Reveal>
-      <Reveal><VideoSection /></Reveal>
-      <Reveal><CTA /></Reveal>
+      <Reveal>
+        <ProductCategories />
+      </Reveal>
+      <Reveal>
+        <WhatWeDo />
+      </Reveal>
+      <Reveal>
+        <RecentPosts locale={locale} />
+      </Reveal>
+      <Reveal>
+        <Experience />
+      </Reveal>
+      <Reveal>
+        <WhyChooseUs />
+      </Reveal>
+      <Reveal>
+        <MeetTheTeam />
+      </Reveal>
+      <Reveal>
+        <GallerySection />
+      </Reveal>
+      <Reveal>
+        <VideoSection />
+      </Reveal>
+      <Reveal>
+        <CTA />
+      </Reveal>
    </div>
  );
 }

-export async function generateMetadata({ params: { locale } }: { params: { locale: string } }): Promise<Metadata> {
+export async function generateMetadata({
+  params: { locale },
+}: {
+  params: { locale: string };
+}): Promise<Metadata> {
  // Use translations for meta where available (namespace: Index.meta)
  // Fallback to a sensible default if translation keys are missing.
  let t;
@@ -62,15 +82,15 @@ export async function generateMetadata({ params: { locale } }: { params: { local
    alternates: {
      canonical: `/${locale}`,
      languages: {
-        'de': '/de',
-        'en': '/en',
+        de: '/de',
+        en: '/en',
        'x-default': '/en',
      },
    },
    openGraph: {
      title: `${title} | KLZ Cables`,
      description,
-      url: `https://klz-cables.com/${locale}`,
+      url: `${SITE_URL}/${locale}`,
      images: getOGImageMetadata('', title, locale),
    },
    twitter: {
--- a/app/[locale]/products/[...slug]/page.tsx
+++ b/app/[locale]/products/[...slug]/page.tsx
@@ -31,12 +31,23 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
  const t = await getTranslations('Products');

  // Check if it's a category page
-  const categories = ['low-voltage-cables', 'medium-voltage-cables', 'high-voltage-cables', 'solar-cables'];
+  const categories = [
+    'low-voltage-cables',
+    'medium-voltage-cables',
+    'high-voltage-cables',
+    'solar-cables',
+  ];
  const fileSlug = await mapSlugToFileSlug(productSlug, locale);
  if (categories.includes(fileSlug)) {
-    const categoryKey = fileSlug.replace(/-cables$/, '').replace(/-([a-z])/g, (g) => g[1].toUpperCase());
-    const categoryTitle = t.has(`categories.${categoryKey}.title`) ? t(`categories.${categoryKey}.title`) : fileSlug;
-    const categoryDesc = t.has(`categories.${categoryKey}.description`) ? t(`categories.${categoryKey}.description`) : '';
+    const categoryKey = fileSlug
+      .replace(/-cables$/, '')
+      .replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+    const categoryTitle = t.has(`categories.${categoryKey}.title`)
+      ? t(`categories.${categoryKey}.title`)
+      : fileSlug;
+    const categoryDesc = t.has(`categories.${categoryKey}.description`)
+      ? t(`categories.${categoryKey}.description`)
+      : '';

    return {
      title: categoryTitle,
@@ -44,15 +55,15 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
      alternates: {
        canonical: `/${locale}/products/${productSlug}`,
        languages: {
-          'de': `/de/products/${await mapFileSlugToTranslated(productSlug, 'de')}`,
-          'en': `/en/products/${await mapFileSlugToTranslated(productSlug, 'en')}`,
+          de: `/de/products/${await mapFileSlugToTranslated(productSlug, 'de')}`,
+          en: `/en/products/${await mapFileSlugToTranslated(productSlug, 'en')}`,
          'x-default': `/en/products/${await mapFileSlugToTranslated(productSlug, 'en')}`,
        },
      },
      openGraph: {
        title: `${categoryTitle} | KLZ Cables`,
        description: categoryDesc,
-        url: `https://klz-cables.com/${locale}/products/${productSlug}`,
+        url: `${SITE_URL}/${locale}/products/${productSlug}`,
        images: getProductOGImageMetadata(fileSlug, categoryTitle, locale),
      },
      twitter: {
@@ -72,8 +83,8 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
    alternates: {
      canonical: `/${locale}/products/${slug.join('/')}`,
      languages: {
-        'de': `/de/products/${await mapFileSlugToTranslated(slug[0], 'de')}/${await mapFileSlugToTranslated(productSlug, 'de')}`,
-        'en': `/en/products/${await mapFileSlugToTranslated(slug[0], 'en')}/${await mapFileSlugToTranslated(productSlug, 'en')}`,
+        de: `/de/products/${await mapFileSlugToTranslated(slug[0], 'de')}/${await mapFileSlugToTranslated(productSlug, 'de')}`,
+        en: `/en/products/${await mapFileSlugToTranslated(slug[0], 'en')}/${await mapFileSlugToTranslated(productSlug, 'en')}`,
        'x-default': `/en/products/${await mapFileSlugToTranslated(slug[0], 'en')}/${await mapFileSlugToTranslated(productSlug, 'en')}`,
      },
    },
@@ -81,7 +92,7 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
      title: `${product.frontmatter.title} | KLZ Cables`,
      description: product.frontmatter.description,
      type: 'website',
-      url: `https://klz-cables.com/${locale}/products/${slug.join('/')}`,
+      url: `${SITE_URL}/${locale}/products/${slug.join('/')}`,
      images: getProductOGImageMetadata(productSlug, product.frontmatter.title, locale),
    },
    twitter: {
@@ -95,20 +106,36 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
 const components = {
  ProductTechnicalData,
  ProductTabs,
-  p: (props: any) => <p {...props} className="text-lg md:text-xl text-text-secondary leading-relaxed mb-8 font-medium" />,
+  p: (props: any) => (
+    <p
+      {...props}
+      className="text-lg md:text-xl text-text-secondary leading-relaxed mb-8 font-medium"
+    />
+  ),
  h2: (props: any) => (
    <div className="relative mb-16">
-      <h2 {...props} className="text-3xl md:text-4xl font-black text-primary tracking-tighter uppercase mb-6" />
+      <h2
+        {...props}
+        className="text-3xl md:text-4xl font-black text-primary tracking-tighter uppercase mb-6"
+      />
      <div className="w-20 h-1.5 bg-accent rounded-full" />
    </div>
  ),
-  h3: (props: any) => <h3 {...props} className="text-2xl md:text-3xl font-black text-primary mb-10 tracking-tight uppercase" />,
+  h3: (props: any) => (
+    <h3
+      {...props}
+      className="text-2xl md:text-3xl font-black text-primary mb-10 tracking-tight uppercase"
+    />
+  ),
  ul: (props: any) => <ul {...props} className="list-none pl-0 mb-10" />,
  section: (props: any) => <div {...props} className="block" />,
  li: (props: any) => (
    <li className="flex items-start gap-4 group mb-4 last:mb-0">
      <div className="mt-2.5 w-2 h-2 rounded-full bg-accent flex-shrink-0 group-hover:scale-125 transition-transform" />
-      <span {...props} className="text-lg md:text-xl text-text-secondary leading-relaxed font-medium" />
+      <span
+        {...props}
+        className="text-lg md:text-xl text-text-secondary leading-relaxed font-medium"
+      />
    </li>
  ),
  strong: (props: any) => <strong {...props} className="font-black text-primary" />,
@@ -117,13 +144,26 @@ const components = {
      <table {...props} className="min-w-full divide-y divide-neutral-dark/10" />
    </div>
  ),
-  th: (props: any) => <th {...props} className="px-8 py-6 bg-neutral-light/50 text-left text-[10px] font-black uppercase tracking-[0.25em] text-primary/60" />,
-  td: (props: any) => <td {...props} className="px-8 py-6 text-text-secondary border-t border-neutral-dark/5 text-lg md:text-xl font-medium" />,
+  th: (props: any) => (
+    <th
+      {...props}
+      className="px-8 py-6 bg-neutral-light/50 text-left text-[10px] font-black uppercase tracking-[0.25em] text-primary/60"
+    />
+  ),
+  td: (props: any) => (
+    <td
+      {...props}
+      className="px-8 py-6 text-text-secondary border-t border-neutral-dark/5 text-lg md:text-xl font-medium"
+    />
+  ),
  hr: () => <hr className="my-24 border-t-2 border-neutral-dark/5" />,
  blockquote: (props: any) => (
    <div className="my-20 p-10 md:p-16 bg-primary-dark rounded-[40px] relative overflow-hidden group">
      <div className="absolute top-0 right-0 w-64 h-64 bg-accent/10 rounded-full -translate-y-1/2 translate-x-1/2 blur-3xl group-hover:bg-accent/20 transition-colors duration-700" />
-      <div className="relative z-10 italic text-2xl md:text-3xl text-white/90 leading-relaxed font-black tracking-tight" {...props} />
+      <div
+        className="relative z-10 italic text-2xl md:text-3xl text-white/90 leading-relaxed font-black tracking-tight"
+        {...props}
+      />
    </div>
  ),
 };
@@ -134,28 +174,36 @@ export default async function ProductPage({ params }: ProductPageProps) {
  const t = await getTranslations('Products');

  // Check if it's a category page
-  const categories = ['low-voltage-cables', 'medium-voltage-cables', 'high-voltage-cables', 'solar-cables'];
+  const categories = [
+    'low-voltage-cables',
+    'medium-voltage-cables',
+    'high-voltage-cables',
+    'solar-cables',
+  ];
  const fileSlug = await mapSlugToFileSlug(productSlug, locale);
-  
+
  if (categories.includes(fileSlug)) {
    const allProducts = await getAllProducts(locale);
-    const categoryKey = fileSlug.replace(/-cables$/, '').replace(/-([a-z])/g, (g) => g[1].toUpperCase());
-    const categoryTitle = t.has(`categories.${categoryKey}.title`) ? t(`categories.${categoryKey}.title`) : fileSlug;
-    
+    const categoryKey = fileSlug
+      .replace(/-cables$/, '')
+      .replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+    const categoryTitle = t.has(`categories.${categoryKey}.title`)
+      ? t(`categories.${categoryKey}.title`)
+      : fileSlug;
+
    // Filter products for this category
-    const filteredProducts = allProducts.filter(p =>
-      p.frontmatter.categories.some(cat =>
-        cat.toLowerCase().replace(/\s+/g, '-') === fileSlug ||
-        cat === categoryTitle
-      )
+    const filteredProducts = allProducts.filter((p) =>
+      p.frontmatter.categories.some(
+        (cat) => cat.toLowerCase().replace(/\s+/g, '-') === fileSlug || cat === categoryTitle,
+      ),
    );

    // Get translated product slugs
    const productsWithTranslatedSlugs = await Promise.all(
      filteredProducts.map(async (p) => ({
        ...p,
-        translatedSlug: await mapFileSlugToTranslated(p.slug, locale)
-      }))
+        translatedSlug: await mapFileSlugToTranslated(p.slug, locale),
+      })),
    );

    return (
@@ -164,7 +212,9 @@ export default async function ProductPage({ params }: ProductPageProps) {
          <Container className="relative z-10">
            <div className="max-w-4xl animate-slide-up">
              <nav className="flex items-center mb-8 text-white/40 text-sm font-bold uppercase tracking-widest">
-                <Link href={`/${locale}/products`} className="hover:text-accent transition-colors">{t('title')}</Link>
+                <Link href={`/${locale}/products`} className="hover:text-accent transition-colors">
+                  {t('title')}
+                </Link>
                <span className="mx-3 opacity-30">/</span>
                <span className="text-white/90">{categoryTitle}</span>
              </nav>
@@ -202,7 +252,10 @@ export default async function ProductPage({ params }: ProductPageProps) {
                  <div className="p-8 md:p-10">
                    <div className="flex flex-wrap gap-2 mb-4">
                      {product.frontmatter.categories.map((cat, i) => (
-                        <span key={i} className="text-[10px] font-bold uppercase tracking-widest text-primary/40">
+                        <span
+                          key={i}
+                          className="text-[10px] font-bold uppercase tracking-widest text-primary/40"
+                        >
                          {cat}
                        </span>
                      ))}
@@ -217,8 +270,18 @@ export default async function ProductPage({ params }: ProductPageProps) {
                      <span className="border-b-2 border-primary/10 group-hover:border-accent-dark transition-colors pb-1">
                        {t('details')}
                      </span>
-                      <svg className="w-5 h-5 ml-3 transition-transform group-hover:translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17 8l4 4m0 0l-4 4m4-4H3" />
+                      <svg
+                        className="w-5 h-5 ml-3 transition-transform group-hover:translate-x-1"
+                        fill="none"
+                        stroke="currentColor"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          strokeLinecap="round"
+                          strokeLinejoin="round"
+                          strokeWidth={2}
+                          d="M17 8l4 4m0 0l-4 4m4-4H3"
+                        />
                      </svg>
                    </div>
                  </div>
@@ -238,7 +301,9 @@ export default async function ProductPage({ params }: ProductPageProps) {
  }

  // Extract technical data for schema
-  const technicalDataMatch = product.content.match(/technicalData=\{<ProductTechnicalData data=\{(.*?)\}\s*\/>\}/s);
+  const technicalDataMatch = product.content.match(
+    /technicalData=\{<ProductTechnicalData data=\{(.*?)\}\s*\/>\}/s,
+  );
  let technicalItems = [];
  if (technicalDataMatch) {
    try {
@@ -253,11 +318,15 @@ export default async function ProductPage({ params }: ProductPageProps) {
  const isFallback = (product.frontmatter as any).isFallback;
  const categorySlug = slug[0];
  const categoryFileSlug = await mapSlugToFileSlug(categorySlug, locale);
-  const categoryKey = categoryFileSlug.replace(/-cables$/, '').replace(/-([a-z])/g, (g) => g[1].toUpperCase());
-  const categoryTitle = t.has(`categories.${categoryKey}.title`) ? t(`categories.${categoryKey}.title`) : categoryFileSlug;
+  const categoryKey = categoryFileSlug
+    .replace(/-cables$/, '')
+    .replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+  const categoryTitle = t.has(`categories.${categoryKey}.title`)
+    ? t(`categories.${categoryKey}.title`)
+    : categoryFileSlug;

  const sidebar = (
-    <ProductSidebar 
+    <ProductSidebar
      productName={product.frontmatter.title}
      productImage={product.frontmatter.images?.[0]}
      datasheetPath={datasheetPath}
@@ -287,17 +356,24 @@ export default async function ProductPage({ params }: ProductPageProps) {
        {/* Background Decorative Elements */}
        <div className="absolute top-0 right-0 w-1/2 h-full bg-gradient-to-l from-accent/5 to-transparent pointer-events-none" />
        <div className="absolute -top-24 -right-24 w-96 h-96 bg-accent/10 rounded-full blur-3xl pointer-events-none" />
-        
+
        <Container className="relative z-10">
          <div className="max-w-4xl animate-slide-up">
            <nav className="flex items-center mb-12 text-white/40 text-[10px] font-black uppercase tracking-[0.2em]">
-              <Link href={`/${locale}/products`} className="hover:text-accent transition-colors">{t('title')}</Link>
+              <Link href={`/${locale}/products`} className="hover:text-accent transition-colors">
+                {t('title')}
+              </Link>
              <span className="mx-4 opacity-20">/</span>
-              <Link href={`/${locale}/products/${categorySlug}`} className="hover:text-accent transition-colors">{categoryTitle}</Link>
+              <Link
+                href={`/${locale}/products/${categorySlug}`}
+                className="hover:text-accent transition-colors"
+              >
+                {categoryTitle}
+              </Link>
              <span className="mx-4 opacity-20">/</span>
              <span className="text-white/90">{product.frontmatter.title}</span>
            </nav>
-            
+
            <div className="flex flex-col lg:flex-row lg:items-center justify-between gap-12">
              <div className="flex-1">
                {isFallback && (
@@ -308,7 +384,11 @@ export default async function ProductPage({ params }: ProductPageProps) {
                )}
                <div className="flex flex-wrap gap-3 mb-8">
                  {product.frontmatter.categories.map((cat, idx) => (
-                    <Badge key={idx} variant="accent" className="bg-white/5 text-white/80 border-white/10 backdrop-blur-md px-5 py-2 text-[10px] font-black tracking-[0.15em]">
+                    <Badge
+                      key={idx}
+                      variant="accent"
+                      className="bg-white/5 text-white/80 border-white/10 backdrop-blur-md px-5 py-2 text-[10px] font-black tracking-[0.15em]"
+                    >
                      {cat}
                    </Badge>
                  ))}
@@ -329,11 +409,14 @@ export default async function ProductPage({ params }: ProductPageProps) {
        <Container className="relative">
          {/* Large Product Image Section */}
          {product.frontmatter.images && product.frontmatter.images.length > 0 && (
-            <div className="relative -mt-32 mb-32 animate-slide-up" style={{ animationDelay: '200ms' }}>
+            <div
+              className="relative -mt-32 mb-32 animate-slide-up"
+              style={{ animationDelay: '200ms' }}
+            >
              <div className="bg-white shadow-[0_32px_64px_-12px_rgba(0,0,0,0.1)] rounded-[48px] border border-neutral-dark/5 overflow-hidden p-12 md:p-20 lg:p-24">
                <div className="relative w-full aspect-[21/9]">
-                  <Image 
-                    src={product.frontmatter.images[0]} 
+                  <Image
+                    src={product.frontmatter.images[0]}
                    alt={product.frontmatter.title}
                    fill
                    className="object-contain transition-transform duration-1000 hover:scale-105"
@@ -342,12 +425,20 @@ export default async function ProductPage({ params }: ProductPageProps) {
                  {/* Subtle reflection/shadow effect */}
                  <div className="absolute bottom-0 left-1/2 -translate-x-1/2 w-3/4 h-12 bg-black/5 blur-3xl rounded-[100%]" />
                </div>
-                
+
                {product.frontmatter.images.length > 1 && (
                  <div className="flex justify-center gap-8 mt-20">
                    {product.frontmatter.images.slice(0, 5).map((img, idx) => (
-                      <div key={idx} className="relative w-24 h-24 md:w-32 md:h-32 border-2 border-neutral-dark/5 rounded-3xl overflow-hidden bg-neutral-light/30 hover:border-accent transition-all duration-500 cursor-pointer group p-4">
-                        <Image src={img} alt="" fill className="object-contain p-4 transition-transform duration-700 group-hover:scale-110" />
+                      <div
+                        key={idx}
+                        className="relative w-24 h-24 md:w-32 md:h-32 border-2 border-neutral-dark/5 rounded-3xl overflow-hidden bg-neutral-light/30 hover:border-accent transition-all duration-500 cursor-pointer group p-4"
+                      >
+                        <Image
+                          src={img}
+                          alt=""
+                          fill
+                          className="object-contain p-4 transition-transform duration-700 group-hover:scale-110"
+                        />
                      </div>
                    ))}
                  </div>
@@ -360,7 +451,7 @@ export default async function ProductPage({ params }: ProductPageProps) {
            <div className="w-full">
              {/* Main Content Area */}
              <div className="max-w-none">
-                 <MDXRemote source={processedContent} components={productComponents} />
+                <MDXRemote source={processedContent} components={productComponents} />
              </div>

              {/* Datasheet Download Section - Only for Medium Voltage for now */}
@@ -379,45 +470,49 @@ export default async function ProductPage({ params }: ProductPageProps) {
              {/* Structured Data */}
              <JsonLd
                id={`jsonld-${product.slug}`}
-                data={{
-                  '@context': 'https://schema.org',
-                  '@type': 'Product',
-                  name: product.frontmatter.title,
-                  description: product.frontmatter.description,
-                  sku: product.frontmatter.sku || product.slug.toUpperCase(),
-                  image: product.frontmatter.images?.[0] ? `https://klz-cables.com${product.frontmatter.images[0]}` : undefined,
-                  brand: {
-                    '@type': 'Brand',
-                    name: 'KLZ Cables',
-                  },
-                  offers: {
-                    '@type': 'Offer',
-                    availability: 'https://schema.org/InStock',
-                    priceCurrency: 'EUR',
-                    url: `https://klz-cables.com/${locale}/products/${slug.join('/')}`,
-                    itemCondition: 'https://schema.org/NewCondition',
-                  },
-                  additionalProperty: technicalItems.map((item: any) => ({
-                    '@type': 'PropertyValue',
-                    name: item.label,
-                    value: item.value,
-                  })),
-                  category: product.frontmatter.categories.join(', '),
-                  mainEntityOfPage: {
-                    '@type': 'WebPage',
-                    '@id': `https://klz-cables.com/${locale}/products/${slug.join('/')}`,
-                  },
-                } as any}
+                data={
+                  {
+                    '@context': 'https://schema.org',
+                    '@type': 'Product',
+                    name: product.frontmatter.title,
+                    description: product.frontmatter.description,
+                    sku: product.frontmatter.sku || product.slug.toUpperCase(),
+                    image: product.frontmatter.images?.[0]
+                      ? `${SITE_URL}${product.frontmatter.images[0]}`
+                      : undefined,
+                    brand: {
+                      '@type': 'Brand',
+                      name: 'KLZ Cables',
+                    },
+                    offers: {
+                      '@type': 'Offer',
+                      availability: 'https://schema.org/InStock',
+                      priceCurrency: 'EUR',
+                      url: `${SITE_URL}/${locale}/products/${slug.join('/')}`,
+                      itemCondition: 'https://schema.org/NewCondition',
+                    },
+                    additionalProperty: technicalItems.map((item: any) => ({
+                      '@type': 'PropertyValue',
+                      name: item.label,
+                      value: item.value,
+                    })),
+                    category: product.frontmatter.categories.join(', '),
+                    mainEntityOfPage: {
+                      '@type': 'WebPage',
+                      '@id': `${SITE_URL}/${locale}/products/${slug.join('/')}`,
+                    },
+                  } as any
+                }
              />
            </div>
          </div>

          {/* Related Products Section */}
          <div className="mt-16 pt-16 border-t border-neutral-dark/5">
-            <RelatedProducts 
-              currentSlug={productSlug} 
-              categories={product.frontmatter.categories} 
-              locale={locale} 
+            <RelatedProducts
+              currentSlug={productSlug}
+              categories={product.frontmatter.categories}
+              locale={locale}
            />
          </div>
        </Container>
--- a/app/[locale]/products/page.tsx
+++ b/app/[locale]/products/page.tsx
@@ -7,6 +7,7 @@ import Image from 'next/image';
 import Link from 'next/link';
 import { mapFileSlugToTranslated } from '@/lib/slugs';
 import { getOGImageMetadata } from '@/lib/metadata';
+import { SITE_URL } from '@/lib/schema';

 interface ProductsPageProps {
  params: {
@@ -14,7 +15,9 @@ interface ProductsPageProps {
  };
 }

-export async function generateMetadata({ params: { locale } }: ProductsPageProps): Promise<Metadata> {
+export async function generateMetadata({
+  params: { locale },
+}: ProductsPageProps): Promise<Metadata> {
  const t = await getTranslations({ locale, namespace: 'Products' });
  const title = t('meta.title') || t('title');
  const description = t('meta.description') || t('subtitle');
@@ -24,15 +27,15 @@ export async function generateMetadata({ params: { locale } }: ProductsPageProps
    alternates: {
      canonical: `/${locale}/products`,
      languages: {
-        'de': '/de/products',
-        'en': '/en/products',
+        de: '/de/products',
+        en: '/en/products',
        'x-default': '/en/products',
      },
    },
    openGraph: {
      title: `${title} | KLZ Cables`,
      description,
-      url: `https://klz-cables.com/${locale}/products`,
+      url: `${SITE_URL}/${locale}/products`,
      images: getOGImageMetadata('products', title, locale),
    },
    twitter: {
@@ -58,29 +61,29 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
      desc: t('categories.lowVoltage.description'),
      img: '/uploads/2024/11/low-voltage-category.webp',
      icon: '/uploads/2024/11/Low-Voltage.svg',
-      href: `/${params.locale}/products/${lowVoltageSlug}`
+      href: `/${params.locale}/products/${lowVoltageSlug}`,
    },
    {
      title: t('categories.mediumVoltage.title'),
      desc: t('categories.mediumVoltage.description'),
      img: '/uploads/2024/11/medium-voltage-category.webp',
      icon: '/uploads/2024/11/Medium-Voltage.svg',
-      href: `/${params.locale}/products/${mediumVoltageSlug}`
+      href: `/${params.locale}/products/${mediumVoltageSlug}`,
    },
    {
      title: t('categories.highVoltage.title'),
      desc: t('categories.highVoltage.description'),
      img: '/uploads/2024/11/high-voltage-category.webp',
      icon: '/uploads/2024/11/High-Voltage.svg',
-      href: `/${params.locale}/products/${highVoltageSlug}`
+      href: `/${params.locale}/products/${highVoltageSlug}`,
    },
    {
      title: t('categories.solar.title'),
      desc: t('categories.solar.description'),
      img: '/uploads/2024/11/solar-category.webp',
      icon: '/uploads/2024/11/Solar.svg',
-      href: `/${params.locale}/products/${solarSlug}`
-    }
+      href: `/${params.locale}/products/${solarSlug}`,
+    },
  ];

  return (
@@ -89,7 +92,10 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
      <section className="relative min-h-[50vh] md:min-h-[70vh] flex items-center pt-32 pb-20 md:pt-40 md:pb-32 overflow-hidden bg-primary-dark">
        <Container className="relative z-10">
          <div className="max-w-4xl animate-slide-up">
-            <Badge variant="saturated" className="mb-4 md:mb-8 shadow-lg px-3 py-1 md:px-4 md:py-1.5">
+            <Badge
+              variant="saturated"
+              className="mb-4 md:mb-8 shadow-lg px-3 py-1 md:px-4 md:py-1.5"
+            >
              {t('heroSubtitle')}
            </Badge>
            <Heading level={1} className="text-white mb-4 md:mb-8">
@@ -97,16 +103,24 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
                green: (chunks) => (
                  <span className="relative inline-block">
                    <span className="relative z-10 text-accent italic">{chunks}</span>
-                    <Scribble variant="circle" className="w-[140%] h-[140%] -top-[20%] -left-[20%] text-accent/30 hidden md:block" />
+                    <Scribble
+                      variant="circle"
+                      className="w-[140%] h-[140%] -top-[20%] -left-[20%] text-accent/30 hidden md:block"
+                    />
                  </span>
-                )
+                ),
              })}
            </Heading>
            <p className="text-lg md:text-xl text-white/70 leading-relaxed max-w-2xl mb-8 md:mb-12 line-clamp-2 md:line-clamp-none">
              {t('subtitle')}
            </p>
            <div className="flex flex-wrap gap-4 md:gap-6">
-              <Button href="#categories" variant="accent" size="lg" className="group w-full md:w-auto">
+              <Button
+                href="#categories"
+                variant="accent"
+                size="lg"
+                className="group w-full md:w-auto"
+              >
                {t('viewProducts')}
                <span className="ml-3 transition-transform group-hover:translate-y-1">↓</span>
              </Button>
@@ -123,8 +137,8 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
                <Link key={idx} href={category.href} className="group block">
                  <Card className="h-full border-none shadow-sm hover:shadow-2xl transition-all duration-500 rounded-[24px] md:rounded-[48px] overflow-hidden bg-white active:scale-[0.98]">
                    <div className="relative h-[200px] md:h-[400px] overflow-hidden">
-                      <Image 
-                        src={category.img} 
+                      <Image
+                        src={category.img}
                        alt={category.title}
                        fill
                        className="object-cover transition-transform duration-1000 group-hover:scale-105"
@@ -132,13 +146,22 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
                        unoptimized
                      />
                      <div className="absolute inset-0 image-overlay-gradient opacity-80 group-hover:opacity-90 transition-opacity duration-500" />
-                      
+
                      <div className="absolute top-3 right-3 md:top-8 md:right-8 w-10 h-10 md:w-20 md:h-20 bg-white/10 backdrop-blur-md rounded-xl md:rounded-[24px] flex items-center justify-center border border-white/20 shadow-2xl transition-all duration-500 group-hover:scale-110 group-hover:bg-white/20">
-                        <Image src={category.icon} alt="" width={24} height={24} className="w-6 h-6 md:w-12 md:h-12 brightness-0 invert opacity-80" />
+                        <Image
+                          src={category.icon}
+                          alt=""
+                          width={24}
+                          height={24}
+                          className="w-6 h-6 md:w-12 md:h-12 brightness-0 invert opacity-80"
+                        />
                      </div>

                      <div className="absolute bottom-4 left-4 md:bottom-10 md:left-10 right-4 md:right-10">
-                        <Badge variant="accent" className="mb-2 md:mb-4 shadow-lg bg-accent text-primary-dark border-none text-[10px] md:text-xs">
+                        <Badge
+                          variant="accent"
+                          className="mb-2 md:mb-4 shadow-lg bg-accent text-primary-dark border-none text-[10px] md:text-xs"
+                        >
                          {t('categoryLabel')}
                        </Badge>
                        <h2 className="text-xl md:text-4xl font-bold text-white leading-tight transition-transform duration-500 group-hover:translate-x-1">
@@ -155,8 +178,18 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
                          {t('viewProducts')}
                        </span>
                        <div className="ml-3 md:ml-4 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 shadow-sm">
-                          <svg className="w-4 h-4 md:w-5 md:h-5 transition-transform group-hover:translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17 8l4 4m0 0l-4 4m4-4H3" />
+                          <svg
+                            className="w-4 h-4 md:w-5 md:h-5 transition-transform group-hover:translate-x-1"
+                            fill="none"
+                            stroke="currentColor"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              strokeLinecap="round"
+                              strokeLinejoin="round"
+                              strokeWidth={2}
+                              d="M17 8l4 4m0 0l-4 4m4-4H3"
+                            />
                          </svg>
                        </div>
                      </div>
@@ -168,7 +201,7 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
          </div>
        </Container>
      </Section>
-      
+
      {/* Technical Support CTA */}
      <Reveal>
        <Section className="bg-white py-12 md:py-28">
@@ -177,14 +210,23 @@ export default async function ProductsPage({ params }: ProductsPageProps) {
              <div className="absolute top-0 right-0 w-1/2 h-full bg-accent/5 -skew-x-12 translate-x-1/4" />
              <div className="relative z-10 flex flex-col lg:flex-row items-center justify-between gap-6 md:gap-12">
                <div className="max-w-2xl text-center lg:text-left">
-                  <h2 className="text-2xl md:text-5xl lg:text-6xl font-bold text-white mb-4 md:mb-8 tracking-tight">{t('cta.title')}</h2>
+                  <h2 className="text-2xl md:text-5xl lg:text-6xl font-bold text-white mb-4 md:mb-8 tracking-tight">
+                    {t('cta.title')}
+                  </h2>
                  <p className="text-base md:text-xl text-white/70 leading-relaxed">
                    {t('cta.description')}
                  </p>
                </div>
-                <Button href={`/${params.locale}/contact`} variant="accent" size="lg" className="group whitespace-nowrap w-full md:w-auto md:h-16 md:px-10 md:text-xl">
+                <Button
+                  href={`/${params.locale}/contact`}
+                  variant="accent"
+                  size="lg"
+                  className="group whitespace-nowrap w-full md:w-auto md:h-16 md:px-10 md:text-xl"
+                >
                  {t('cta.button')}
-                  <span className="ml-4 transition-transform group-hover:translate-x-2">&rarr;</span>
+                  <span className="ml-4 transition-transform group-hover:translate-x-2">
+                    &rarr;
+                  </span>
                </Button>
              </div>
            </div>
--- a/app/[locale]/team/page.tsx
+++ b/app/[locale]/team/page.tsx
@@ -24,15 +24,15 @@ export async function generateMetadata({ params: { locale } }: TeamPageProps): P
    alternates: {
      canonical: `/${locale}/team`,
      languages: {
-        'de': '/de/team',
-        'en': '/en/team',
+        de: '/de/team',
+        en: '/en/team',
        'x-default': '/en/team',
      },
    },
    openGraph: {
      title: `${title} | KLZ Cables`,
      description,
-      url: `https://klz-cables.com/${locale}/team`,
+      url: `${SITE_URL}/${locale}/team`,
      images: getOGImageMetadata('team', title, locale),
    },
    twitter: {
@@ -50,9 +50,7 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
    <div className="flex flex-col min-h-screen bg-neutral-light">
      <JsonLd
        id="breadcrumb-team"
-        data={getBreadcrumbSchema([
-          { name: t('hero.subtitle'), item: `/team` },
-        ])}
+        data={getBreadcrumbSchema([{ name: t('hero.subtitle'), item: `/team` }])}
      />
      <JsonLd
        id="person-michael"
@@ -65,10 +63,8 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
            '@type': 'Organization',
            name: 'KLZ Cables',
          },
-          sameAs: [
-            'https://www.linkedin.com/in/michael-bodemer-33b493122/'
-          ],
-          image: `${SITE_URL}/uploads/2024/12/DSC07768-Large.webp`
+          sameAs: ['https://www.linkedin.com/in/michael-bodemer-33b493122/'],
+          image: `${SITE_URL}/uploads/2024/12/DSC07768-Large.webp`,
        }}
      />
      <JsonLd
@@ -82,10 +78,8 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
            '@type': 'Organization',
            name: 'KLZ Cables',
          },
-          sameAs: [
-            'https://www.linkedin.com/in/klaus-mintel-b80a8b193/'
-          ],
-          image: `${SITE_URL}/uploads/2024/12/DSC07963-Large.webp`
+          sameAs: ['https://www.linkedin.com/in/klaus-mintel-b80a8b193/'],
+          image: `${SITE_URL}/uploads/2024/12/DSC07963-Large.webp`,
        }}
      />
      {/* Hero Section */}
@@ -101,9 +95,11 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
            />
            <div className="absolute inset-0 bg-gradient-to-b from-primary-dark/80 via-primary-dark/40 to-primary-dark/80" />
          </div>
-          
+
          <Container className="relative z-10 text-center text-white max-w-5xl">
-            <Badge variant="saturated" className="mb-4 md:mb-8 shadow-lg">{t('hero.badge')}</Badge>
+            <Badge variant="saturated" className="mb-4 md:mb-8 shadow-lg">
+              {t('hero.badge')}
+            </Badge>
            <Heading level={1} className="text-white mb-4 md:mb-8">
              {t('hero.subtitle')}
            </Heading>
@@ -120,7 +116,9 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
          <Reveal className="w-full lg:w-1/2 p-6 md:p-24 lg:p-32 flex flex-col justify-center bg-primary-dark text-white relative order-2 lg:order-1">
            <div className="absolute top-0 right-0 w-32 h-full bg-accent/5 -skew-x-12 translate-x-1/2" />
            <div className="relative z-10">
-              <Badge variant="accent" className="mb-4 md:mb-8">{t('michael.role')}</Badge>
+              <Badge variant="accent" className="mb-4 md:mb-8">
+                {t('michael.role')}
+              </Badge>
              <Heading level={2} className="text-white mb-6 md:mb-10 text-3xl md:text-5xl">
                <span className="text-white">{t('michael.name')}</span>
              </Heading>
@@ -133,9 +131,9 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
              <p className="text-base md:text-xl leading-relaxed text-white/70 mb-6 md:mb-12 max-w-xl">
                {t('michael.description')}
              </p>
-              <Button 
-                href="https://www.linkedin.com/in/michael-bodemer-33b493122/" 
-                variant="accent" 
+              <Button
+                href="https://www.linkedin.com/in/michael-bodemer-33b493122/"
+                variant="accent"
                size="lg"
                className="group w-full md:w-auto md:h-16 md:px-10 md:text-xl active:scale-95 transition-transform"
              >
@@ -173,26 +171,36 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
          <Container className="relative z-10">
            <div className="grid grid-cols-1 lg:grid-cols-12 gap-8 md:gap-16 items-center">
              <div className="lg:col-span-6">
-                <Heading level={2} subtitle={t('legacy.subtitle')} className="text-white mb-6 md:mb-10">
+                <Heading
+                  level={2}
+                  subtitle={t('legacy.subtitle')}
+                  className="text-white mb-6 md:mb-10"
+                >
                  <span className="text-white">{t('legacy.title')}</span>
                </Heading>
                <div className="space-y-4 md:space-y-8 text-base md:text-2xl text-white/80 leading-relaxed font-medium">
                  <p className="border-l-4 border-accent pl-5 md:pl-8 py-2 bg-white/5 backdrop-blur-sm rounded-r-xl md:rounded-r-2xl">
                    {t('legacy.p1')}
                  </p>
-                  <p className="pl-6 md:pl-9 line-clamp-3 md:line-clamp-none">
-                    {t('legacy.p2')}
-                  </p>
+                  <p className="pl-6 md:pl-9 line-clamp-3 md:line-clamp-none">{t('legacy.p2')}</p>
                </div>
              </div>
              <div className="lg:col-span-6 grid grid-cols-2 md:grid-cols-2 gap-3 md:gap-6">
                <div className="p-4 md:p-8 bg-white/5 backdrop-blur-md border border-white/10 rounded-2xl md:rounded-[32px] hover:bg-white/10 transition-colors">
-                  <div className="text-xl md:text-4xl font-extrabold text-accent mb-1 md:mb-2">{t('legacy.expertise')}</div>
-                  <div className="text-[10px] md:text-sm font-bold uppercase tracking-widest text-white/50">{t('legacy.expertiseDesc')}</div>
+                  <div className="text-xl md:text-4xl font-extrabold text-accent mb-1 md:mb-2">
+                    {t('legacy.expertise')}
+                  </div>
+                  <div className="text-[10px] md:text-sm font-bold uppercase tracking-widest text-white/50">
+                    {t('legacy.expertiseDesc')}
+                  </div>
                </div>
                <div className="p-4 md:p-8 bg-white/5 backdrop-blur-md border border-white/10 rounded-2xl md:rounded-[32px] hover:bg-white/10 transition-colors">
-                  <div className="text-xl md:text-4xl font-extrabold text-accent mb-1 md:mb-2">{t('legacy.network')}</div>
-                  <div className="text-[10px] md:text-sm font-bold uppercase tracking-widest text-white/50">{t('legacy.networkDesc')}</div>
+                  <div className="text-xl md:text-4xl font-extrabold text-accent mb-1 md:mb-2">
+                    {t('legacy.network')}
+                  </div>
+                  <div className="text-[10px] md:text-sm font-bold uppercase tracking-widest text-white/50">
+                    {t('legacy.networkDesc')}
+                  </div>
                </div>
              </div>
            </div>
@@ -216,7 +224,9 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
          <Reveal className="w-full lg:w-1/2 p-6 md:p-24 lg:p-32 flex flex-col justify-center bg-neutral-light text-saturated relative order-2">
            <div className="absolute top-0 left-0 w-32 h-full bg-saturated/5 skew-x-12 -translate-x-1/2" />
            <div className="relative z-10">
-              <Badge variant="saturated" className="mb-4 md:mb-8">{t('klaus.role')}</Badge>
+              <Badge variant="saturated" className="mb-4 md:mb-8">
+                {t('klaus.role')}
+              </Badge>
              <Heading level={2} className="text-saturated mb-6 md:mb-10 text-3xl md:text-6xl">
                {t('klaus.name')}
              </Heading>
@@ -229,9 +239,9 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
              <p className="text-base md:text-xl leading-relaxed text-text-secondary mb-6 md:mb-12 max-w-xl">
                {t('klaus.description')}
              </p>
-              <Button 
-                href="https://www.linkedin.com/in/klaus-mintel-b80a8b193/" 
-                variant="saturated" 
+              <Button
+                href="https://www.linkedin.com/in/klaus-mintel-b80a8b193/"
+                variant="saturated"
                size="lg"
                className="group w-full md:w-auto md:h-16 md:px-10 md:text-xl active:scale-95 transition-transform"
              >
@@ -255,11 +265,14 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
                <p className="text-base md:text-xl text-text-secondary leading-relaxed">
                  {t('manifesto.tagline')}
                </p>
-                
+
                {/* Mobile-only progress indicator */}
                <div className="flex lg:hidden mt-8 gap-2">
                  {[0, 1, 2, 3, 4, 5].map((i) => (
-                    <div key={i} className="h-1.5 flex-1 bg-neutral-medium rounded-full overflow-hidden">
+                    <div
+                      key={i}
+                      className="h-1.5 flex-1 bg-neutral-medium rounded-full overflow-hidden"
+                    >
                      <div className="h-full bg-accent w-0 group-active:w-full transition-all duration-500" />
                    </div>
                  ))}
@@ -268,12 +281,21 @@ export default async function TeamPage({ params: { locale } }: TeamPageProps) {
            </div>
            <div className="sticky-narrative-content grid grid-cols-1 md:grid-cols-2 gap-4 md:gap-10">
              {[0, 1, 2, 3, 4, 5].map((idx) => (
-                <div key={idx} className="p-6 md:p-10 bg-neutral-light rounded-2xl md:rounded-[40px] border border-transparent hover:border-accent hover:bg-white hover:shadow-2xl transition-all duration-500 group active:scale-[0.98] touch-target-none">
+                <div
+                  key={idx}
+                  className="p-6 md:p-10 bg-neutral-light rounded-2xl md:rounded-[40px] border border-transparent hover:border-accent hover:bg-white hover:shadow-2xl transition-all duration-500 group active:scale-[0.98] touch-target-none"
+                >
                  <div className="w-10 h-10 md:w-16 md:h-16 bg-white rounded-xl md:rounded-2xl flex items-center justify-center mb-4 md:mb-8 shadow-sm group-hover:bg-accent transition-colors duration-500">
-                    <span className="text-primary font-extrabold text-lg md:text-2xl group-hover:text-primary-dark">0{idx + 1}</span>
+                    <span className="text-primary font-extrabold text-lg md:text-2xl group-hover:text-primary-dark">
+                      0{idx + 1}
+                    </span>
                  </div>
-                  <h3 className="text-lg md:text-2xl font-bold mb-2 md:mb-4 text-primary">{t(`manifesto.items.${idx}.title`)}</h3>
-                  <p className="text-sm md:text-lg text-text-secondary leading-relaxed">{t(`manifesto.items.${idx}.description`)}</p>
+                  <h3 className="text-lg md:text-2xl font-bold mb-2 md:mb-4 text-primary">
+                    {t(`manifesto.items.${idx}.title`)}
+                  </h3>
+                  <p className="text-sm md:text-lg text-text-secondary leading-relaxed">
+                    {t(`manifesto.items.${idx}.description`)}
+                  </p>
                </div>
              ))}
            </div>
--- a/app/actions/contact.ts
+++ b/app/actions/contact.ts
@@ -1,72 +1,131 @@
-"use server";
+'use server';

-import client, { ensureAuthenticated } from "@/lib/directus";
-import { createItem } from "@directus/sdk";
-import { sendEmail } from "@/lib/mail/mailer";
-import ContactEmail from "@/components/emails/ContactEmail";
-import React from "react";
-import { getServerAppServices } from "@/lib/services/create-services.server";
+import client, { ensureAuthenticated } from '@/lib/directus';
+import { createItem } from '@directus/sdk';
+import { sendEmail } from '@/lib/mail/mailer';
+import { render, ContactFormNotification, ConfirmationMessage } from '@mintel/mail';
+import React from 'react';
+import { getServerAppServices } from '@/lib/services/create-services.server';

 export async function sendContactFormAction(formData: FormData) {
  const services = getServerAppServices();
  const logger = services.logger.child({ action: 'sendContactFormAction' });
-  const name = formData.get("name") as string;
-  const email = formData.get("email") as string;
-  const message = formData.get("message") as string;
-  const productName = formData.get("productName") as string | null;
+  const name = formData.get('name') as string;
+  const email = formData.get('email') as string;
+  const message = formData.get('message') as string;
+  const productName = formData.get('productName') as string | null;

  if (!name || !email || !message) {
-    logger.warn('Missing required fields in contact form', { name: !!name, email: !!email, message: !!message });
-    return { success: false, error: "Missing required fields" };
+    logger.warn('Missing required fields in contact form', {
+      name: !!name,
+      email: !!email,
+      message: !!message,
+    });
+    return { success: false, error: 'Missing required fields' };
  }

  // 1. Save to Directus
  try {
    await ensureAuthenticated();
    if (productName) {
-      await client.request(createItem('product_requests', {
-        product_name: productName,
-        email,
-        message
-      }));
+      await client.request(
+        createItem('product_requests', {
+          product_name: productName,
+          email,
+          message,
+        }),
+      );
      logger.info('Product request stored in Directus');
    } else {
-      await client.request(createItem('contact_submissions', {
-        name,
-        email,
-        message
-      }));
+      await client.request(
+        createItem('contact_submissions', {
+          name,
+          email,
+          message,
+        }),
+      );
      logger.info('Contact submission stored in Directus');
    }
  } catch (error) {
    logger.error('Failed to store submission in Directus', { error });
-    // We continue anyway to try sending the email, but maybe we should report this
+    services.errors.captureException(error, { action: 'directus_store_submission' });
  }

-  // 2. Send Email
-  logger.info('Sending contact form email', { email, productName });
+  // 2. Send Emails
+  logger.info('Sending branded emails', { email, productName });

-  const subject = productName
+  const notificationSubject = productName
    ? `Product Inquiry: ${productName}`
-    : "New Contact Form Submission";
+    : 'New Contact Form Submission';
+  const confirmationSubject = 'Thank you for your inquiry';

-  const result = await sendEmail({
-    subject,
-    template: React.createElement(ContactEmail, {
-      name,
-      email,
-      message,
-      productName: productName || undefined,
-      subject,
-    }),
-  });
+  try {
+    // 2a. Send notification to Mintel/Client
+    const notificationHtml = await render(
+      React.createElement(ContactFormNotification, {
+        name,
+        email,
+        message,
+        productName: productName || undefined,
+      }),
+    );

-  if (result.success) {
-    logger.info('Contact form email sent successfully', { messageId: result.messageId });
-  } else {
-    logger.error('Failed to send contact form email', { error: result.error });
-    services.errors.captureException(result.error, { action: 'sendContactFormAction', email });
+    const notificationResult = await sendEmail({
+      replyTo: email,
+      subject: notificationSubject,
+      html: notificationHtml,
+    });
+
+    if (notificationResult.success) {
+      logger.info('Notification email sent successfully', {
+        messageId: notificationResult.messageId,
+      });
+    }
+
+    // 2b. Send confirmation to Customer (branded as KLZ Cables)
+    const confirmationHtml = await render(
+      React.createElement(ConfirmationMessage, {
+        name,
+        clientName: 'KLZ Cables',
+        // brandColor: '#82ed20', // Optional: could be KLZ specific
+      }),
+    );
+
+    const confirmationResult = await sendEmail({
+      to: email,
+      subject: confirmationSubject,
+      html: confirmationHtml,
+    });
+
+    if (confirmationResult.success) {
+      logger.info('Confirmation email sent successfully', {
+        messageId: confirmationResult.messageId,
+      });
+    }
+
+    // Notify via Gotify (Internal)
+    await services.notifications.notify({
+      title: `📩 ${notificationSubject}`,
+      message: `New message from ${name} (${email}):\n\n${message}`,
+      priority: 5,
+    });
+
+    return { success: true };
+  } catch (error) {
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    logger.error('Failed to send branded emails', {
+      error: errorMsg,
+      stack: error instanceof Error ? error.stack : undefined,
+    });
+
+    services.errors.captureException(error, { action: 'sendContactFormAction', email });
+
+    await services.notifications.notify({
+      title: '🚨 Contact Form Error',
+      message: `Failed to send emails for ${name} (${email}). Error: ${errorMsg}`,
+      priority: 8,
+    });
+
+    return { success: false, error: errorMsg };
  }
-
-  return result;
 }
--- a/app/api/health/cms/route.ts
+++ b/app/api/health/cms/route.ts
@@ -0,0 +1,9 @@
+import { checkHealth } from '@/lib/directus';
+import { NextResponse } from 'next/server';
+
+export const dynamic = 'force-dynamic';
+
+export async function GET() {
+    const health = await checkHealth();
+    return NextResponse.json(health, { status: health.status === 'ok' ? 200 : 503 });
+}
--- a/app/manifest.ts
+++ b/app/manifest.ts
@@ -15,6 +15,11 @@ export default function manifest(): MetadataRoute.Manifest {
        sizes: 'any',
        type: 'image/x-icon',
      },
+      {
+        src: '/logo.png',
+        sizes: '512x512',
+        type: 'image/png',
+      },
      {
        src: '/apple-touch-icon.png',
        sizes: '180x180',
--- a/app/robots.ts
+++ b/app/robots.ts
@@ -1,6 +1,8 @@
+import { config } from '@/lib/config';
 import { MetadataRoute } from 'next';

 export default function robots(): MetadataRoute.Robots {
+  const baseUrl = config.baseUrl || 'https://klz-cables.com';
  return {
    rules: [
      {
@@ -11,8 +13,8 @@ export default function robots(): MetadataRoute.Robots {
      {
        userAgent: ['GPTBot', 'ClaudeBot', 'PerplexityBot', 'Google-Extended', 'OAI-SearchBot'],
        allow: '/',
-      }
+      },
    ],
-    sitemap: 'https://klz-cables.com/sitemap.xml',
+    sitemap: `${baseUrl}/sitemap.xml`,
  };
 }
--- a/app/sitemap.ts
+++ b/app/sitemap.ts
@@ -1,10 +1,13 @@
+import { config } from '@/lib/config';
 import { MetadataRoute } from 'next';
-import { getAllProducts } from '@/lib/mdx';
-import { getAllPosts } from '@/lib/blog';
-import { getAllPages } from '@/lib/pages';
+import { getAllProductsMetadata } from '@/lib/mdx';
+import { getAllPostsMetadata } from '@/lib/blog';
+import { getAllPagesMetadata } from '@/lib/pages';
+
+export const revalidate = 3600; // Revalidate every hour

 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
-  const baseUrl = 'https://klz-cables.com';
+  const baseUrl = config.baseUrl || 'https://klz-cables.com';
  const locales = ['de', 'en'];

  const routes = [
@@ -33,12 +36,12 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
    }

    // Products
-    const products = await getAllProducts(locale);
-    for (const product of products) {
-      // We need to find the category for the product to build the URL
-      // In this project, products are under /products/[category]/[slug]
-      // The category is in product.frontmatter.categories
-      const category = product.frontmatter.categories[0]?.toLowerCase().replace(/\s+/g, '-') || 'other';
+    const productsMetadata = await getAllProductsMetadata(locale);
+    for (const product of productsMetadata) {
+      if (!product.frontmatter || !product.slug) continue;
+
+      const category =
+        product.frontmatter.categories[0]?.toLowerCase().replace(/\s+/g, '-') || 'other';
      sitemapEntries.push({
        url: `${baseUrl}/${locale}/products/${category}/${product.slug}`,
        lastModified: new Date(),
@@ -48,8 +51,10 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
    }

    // Blog posts
-    const posts = await getAllPosts(locale);
-    for (const post of posts) {
+    const postsMetadata = await getAllPostsMetadata(locale);
+    for (const post of postsMetadata) {
+      if (!post.frontmatter || !post.slug) continue;
+
      sitemapEntries.push({
        url: `${baseUrl}/${locale}/blog/${post.slug}`,
        lastModified: new Date(post.frontmatter.date),
@@ -59,8 +64,10 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
    }

    // Static pages
-    const pages = await getAllPages(locale);
-    for (const page of pages) {
+    const pagesMetadata = await getAllPagesMetadata(locale);
+    for (const page of pagesMetadata) {
+      if (!page.slug) continue;
+
      sitemapEntries.push({
        url: `${baseUrl}/${locale}/${page.slug}`,
        lastModified: new Date(),
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'header-max-length': [2, 'always', 500],
+    'subject-case': [0],
+    'subject-full-stop': [0],
+  },
+};
--- a/components/CMSConnectivityNotice.tsx
+++ b/components/CMSConnectivityNotice.tsx
@@ -0,0 +1,84 @@
+'use client';
+
+import React, { useEffect, useState } from 'react';
+import { AlertCircle, RefreshCw, Database } from 'lucide-react';
+import { config } from '../lib/config';
+
+export default function CMSConnectivityNotice() {
+  const [status, setStatus] = useState<'checking' | 'ok' | 'error'>('checking');
+  const [errorMsg, setErrorMsg] = useState('');
+  const [isVisible, setIsVisible] = useState(false);
+
+  useEffect(() => {
+    // Only show if we've detected an issue AND we are in a context where we want to see it
+    const checkCMS = async () => {
+      const isDebug = new URLSearchParams(window.location.search).has('cms_debug');
+      const isLocal = config.isDevelopment;
+      const isTesting = config.isTesting;
+
+      // Only proceed with check if it's developer context (Local or Testing)
+      // Staging and Production should NEVER see this unless forced with ?cms_debug
+      if (!isLocal && !isTesting && !isDebug) return;
+
+      try {
+        const response = await fetch('/api/health/cms');
+        const data = await response.json();
+
+        if (data.status !== 'ok') {
+          setStatus('error');
+          setErrorMsg(data.message);
+          setIsVisible(true);
+        } else {
+          setStatus('ok');
+          setIsVisible(false);
+        }
+      } catch (err) {
+        // If it's a connection error, only show if we are really debugging
+        if (isDebug || isLocal) {
+          setStatus('error');
+          setErrorMsg('Could not connect to CMS health endpoint');
+          setIsVisible(true);
+        }
+      }
+    };
+
+    checkCMS();
+  }, []);
+
+  if (!isVisible) return null;
+
+  return (
+    <div className="fixed bottom-4 right-4 z-[9999] animate-slide-up">
+      <div className="bg-red-500/90 backdrop-blur-md border border-red-400 text-white p-4 rounded-2xl shadow-2xl max-w-sm">
+        <div className="flex items-start gap-3">
+          <div className="bg-white/20 p-2 rounded-lg">
+            <AlertCircle className="w-5 h-5" />
+          </div>
+          <div className="flex-1">
+            <h4 className="font-bold text-sm mb-1">CMS Issue Detected</h4>
+            <p className="text-xs opacity-90 leading-relaxed mb-3">
+              {errorMsg === 'relation "products" does not exist'
+                ? 'The database schema is missing. Please sync your local data to this environment.'
+                : errorMsg || 'The application cannot connect to the Directus CMS.'}
+            </p>
+            <div className="flex gap-2">
+              <button
+                onClick={() => window.location.reload()}
+                className="bg-white text-red-600 text-[10px] font-bold uppercase tracking-wider px-3 py-1.5 rounded-lg flex items-center gap-2 hover:bg-neutral-100 transition-colors"
+              >
+                <RefreshCw className="w-3 h-3" />
+                Retry
+              </button>
+              <button
+                onClick={() => setIsVisible(false)}
+                className="bg-black/20 text-white text-[10px] font-bold uppercase tracking-wider px-3 py-1.5 rounded-lg hover:bg-black/30 transition-colors"
+              >
+                Dismiss
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
--- a/components/ContactForm.tsx
+++ b/components/ContactForm.tsx
@@ -17,10 +17,10 @@ export default function ContactForm() {

    const formData = new FormData(e.currentTarget);
    const email = formData.get('email') as string;
-    
+
    try {
      const result = await sendContactFormAction(formData);
-      if (result.success) {
+      if (result?.success) {
        trackEvent('contact_form_submission', {
          form_type: 'general',
          email,
@@ -41,7 +41,12 @@ export default function ContactForm() {
    return (
      <Card className="p-6 md:p-12 rounded-2xl md:rounded-[40px] border-none shadow-2xl text-center">
        <div className="w-20 h-20 bg-accent rounded-full flex items-center justify-center mx-auto mb-6 shadow-lg shadow-accent/20">
-          <svg className="w-10 h-10 text-primary-dark" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <svg
+            className="w-10 h-10 text-primary-dark"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+          >
            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={3} d="M5 13l4 4L19 7" />
          </svg>
        </div>
@@ -49,7 +54,8 @@ export default function ContactForm() {
          {t('form.successTitle') || 'Message Sent!'}
        </Heading>
        <p className="text-text-secondary text-lg mb-8">
-          {t('form.successDesc') || 'Thank you for your message. We will get back to you as soon as possible.'}
+          {t('form.successDesc') ||
+            'Thank you for your message. We will get back to you as soon as possible.'}
        </p>
        <Button onClick={() => setStatus('idle')} variant="saturated">
          {t('form.sendAnother') || 'Send another message'}
@@ -62,7 +68,13 @@ export default function ContactForm() {
    return (
      <Card className="p-6 md:p-12 rounded-2xl md:rounded-[40px] border-destructive/20 shadow-2xl text-center bg-destructive/5 animate-slide-up">
        <div className="w-20 h-20 bg-destructive rounded-full flex items-center justify-center mx-auto mb-6 shadow-lg shadow-destructive/20">
-          <svg className="w-10 h-10 text-destructive-foreground" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth="2">
+          <svg
+            className="w-10 h-10 text-destructive-foreground"
+            fill="none"
+            viewBox="0 0 24 24"
+            stroke="currentColor"
+            strokeWidth="2"
+          >
            <circle cx="12" cy="12" r="10" />
            <line x1="15" y1="9" x2="9" y2="15" strokeLinecap="round" strokeLinejoin="round" />
            <line x1="9" y1="9" x2="15" y2="15" strokeLinecap="round" strokeLinejoin="round" />
@@ -74,7 +86,12 @@ export default function ContactForm() {
        <p className="text-destructive/80 text-lg mb-8 leading-relaxed font-medium">
          {t('form.error') || 'Something went wrong. Please check your input and try again.'}
        </p>
-        <Button onClick={() => setStatus('idle')} variant="saturated" size="lg" className="w-full bg-destructive hover:bg-destructive/90 text-destructive-foreground border-destructive shadow-lg shadow-destructive/20">
+        <Button
+          onClick={() => setStatus('idle')}
+          variant="destructive"
+          size="lg"
+          className="w-full"
+        >
          {t('form.tryAgain') || 'Try Again'}
        </Button>
      </Card>
@@ -89,9 +106,9 @@ export default function ContactForm() {
      <form onSubmit={handleSubmit} className="grid grid-cols-1 md:grid-cols-2 gap-4 md:gap-8">
        <div className="space-y-1 md:space-y-2">
          <Label htmlFor="name">{t('form.name')}</Label>
-          <Input 
-            type="text" 
-            id="name" 
+          <Input
+            type="text"
+            id="name"
            name="name"
            autoComplete="name"
            enterKeyHint="next"
@@ -101,9 +118,9 @@ export default function ContactForm() {
        </div>
        <div className="space-y-1 md:space-y-2">
          <Label htmlFor="email">{t('form.email')}</Label>
-          <Input 
-            type="email" 
-            id="email" 
+          <Input
+            type="email"
+            id="email"
            name="email"
            autoComplete="email"
            inputMode="email"
@@ -114,32 +131,50 @@ export default function ContactForm() {
        </div>
        <div className="md:col-span-2 space-y-1 md:space-y-2">
          <Label htmlFor="message">{t('form.message')}</Label>
-          <Textarea 
-            id="message" 
+          <Textarea
+            id="message"
            name="message"
-            rows={4} 
+            rows={4}
            enterKeyHint="send"
            placeholder={t('form.messagePlaceholder')}
            required
          />
        </div>
        <div className="md:col-span-2 pt-2 md:pt-4">
-          <Button 
-            type="submit" 
-            variant="saturated" 
-            size="lg" 
+          <Button
+            type="submit"
+            variant="saturated"
+            size="lg"
            disabled={status === 'submitting'}
            className="w-full shadow-xl shadow-saturated/20 md:h-16 md:px-10 md:text-xl active:scale-[0.98] transition-transform"
          >
            {status === 'submitting' ? (
              <span className="flex items-center gap-2">
-                <svg className="animate-spin h-5 w-5 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                  <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
-                  <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                <svg
+                  className="animate-spin h-5 w-5 text-white"
+                  xmlns="http://www.w3.org/2000/svg"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                >
+                  <circle
+                    className="opacity-25"
+                    cx="12"
+                    cy="12"
+                    r="10"
+                    stroke="currentColor"
+                    strokeWidth="4"
+                  ></circle>
+                  <path
+                    className="opacity-75"
+                    fill="currentColor"
+                    d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                  ></path>
                </svg>
                {t('form.submitting') || 'Sending...'}
              </span>
-            ) : t('form.submit')}
+            ) : (
+              t('form.submit')
+            )}
          </Button>
        </div>
      </form>
--- a/components/RequestQuoteForm.tsx
+++ b/components/RequestQuoteForm.tsx
@@ -49,14 +49,28 @@ export default function RequestQuoteForm({ productName }: RequestQuoteFormProps)

  if (status === 'success') {
    return (
-      <div className="bg-accent/5 border border-accent/20 text-primary-dark p-4 rounded-xl text-center animate-fade-in !mt-0">
-        <div className="w-10 h-10 bg-accent rounded-full flex items-center justify-center mx-auto mb-3 shadow-lg shadow-accent/20">
-          <svg className="w-5 h-5 text-primary-dark" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={3} d="M5 13l4 4L19 7" />
-          </svg>
+      <div className="bg-accent/5 border border-accent/20 text-primary-dark p-4 rounded-xl text-center animate-fade-in !mt-0 w-full">
+        <div className="flex justify-center mb-3">
+          <div className="w-10 h-10 bg-accent rounded-full flex items-center justify-center shadow-lg shadow-accent/20">
+            <svg
+              className="w-5 h-5 text-primary-dark"
+              fill="none"
+              stroke="currentColor"
+              viewBox="0 0 24 24"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={3}
+                d="M5 13l4 4L19 7"
+              />
+            </svg>
+          </div>
        </div>
-        <h3 className="text-base font-extrabold mb-1 tracking-tight !mt-0">{t('successTitle')}</h3>
-        <p className="text-text-secondary text-xs leading-tight mb-4 !mt-0">
+        <h3 className="text-base font-extrabold mb-1 tracking-tight !mt-0 text-center w-full">
+          {t('successTitle')}
+        </h3>
+        <p className="text-text-secondary text-xs leading-tight mb-4 !mt-0 text-center w-full">
          {t('successDesc', { productName })}
        </p>
        <button
@@ -73,26 +87,36 @@ export default function RequestQuoteForm({ productName }: RequestQuoteFormProps)

  if (status === 'error') {
    return (
-      <div className="bg-destructive/5 border border-destructive/20 text-destructive p-4 rounded-xl text-center animate-fade-in !mt-0">
-        <div className="w-10 h-10 bg-destructive rounded-full flex items-center justify-center mx-auto mb-3 shadow-lg shadow-destructive/20">
-          <svg className="w-5 h-5 text-destructive-foreground" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth="3">
-            <circle cx="12" cy="12" r="10" />
-            <line x1="15" y1="9" x2="9" y2="15" />
-            <line x1="9" y1="9" x2="15" y2="15" />
-          </svg>
+      <div className="bg-destructive/5 border border-destructive/20 text-destructive p-4 rounded-xl text-center animate-fade-in !mt-0 w-full">
+        <div className="flex justify-center mb-3">
+          <div className="w-10 h-10 bg-destructive rounded-full flex items-center justify-center shadow-lg shadow-destructive/20">
+            <svg
+              className="w-5 h-5 text-destructive-foreground"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke="currentColor"
+              strokeWidth="3"
+            >
+              <circle cx="12" cy="12" r="10" />
+              <line x1="15" y1="9" x2="9" y2="15" />
+              <line x1="9" y1="9" x2="15" y2="15" />
+            </svg>
+          </div>
        </div>
-        <h3 className="text-base font-extrabold mb-1 tracking-tight !mt-0 text-destructive">{t('errorTitle') || 'Submission Failed'}</h3>
-        <p className="text-destructive/80 text-xs leading-tight mb-4 !mt-0">
+        <h3 className="text-base font-extrabold mb-1 tracking-tight !mt-0 text-destructive text-center w-full">
+          {t('errorTitle') || 'Submission Failed'}
+        </h3>
+        <p className="text-destructive/80 text-xs leading-tight mb-4 !mt-0 text-center w-full">
          {t('errorDesc') || 'Something went wrong. Please try again.'}
        </p>
-        <button
+        <Button
          onClick={() => setStatus('idle')}
-          className="inline-flex items-center text-[9px] font-bold uppercase tracking-[0.2em] text-destructive hover:text-destructive/80 transition-colors group"
+          variant="destructive"
+          size="sm"
+          className="w-full"
        >
-          <span className="border-b-2 border-destructive/10 group-hover:border-destructive/30 transition-colors pb-1">
-            {t('tryAgain') || 'Try Again'}
-          </span>
-        </button>
+          {t('tryAgain') || 'Try Again'}
+        </Button>
      </div>
    );
  }
@@ -133,22 +157,48 @@ export default function RequestQuoteForm({ productName }: RequestQuoteFormProps)
        >
          {status === 'submitting' ? (
            <>
-              <svg className="animate-spin h-3 w-3 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
-                <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+              <svg
+                className="animate-spin h-3 w-3 text-white"
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+              >
+                <circle
+                  className="opacity-25"
+                  cx="12"
+                  cy="12"
+                  r="10"
+                  stroke="currentColor"
+                  strokeWidth="4"
+                ></circle>
+                <path
+                  className="opacity-75"
+                  fill="currentColor"
+                  d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                ></path>
              </svg>
              <span className="text-xs">{t('submitting')}</span>
            </>
          ) : (
            <>
              <span className="text-xs">{t('submit')}</span>
-              <svg className="w-3 h-3 transition-transform group-hover:translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17 8l4 4m0 0l-4 4m4-4H3" />
+              <svg
+                className="w-3 h-3 transition-transform group-hover:translate-x-1"
+                fill="none"
+                stroke="currentColor"
+                viewBox="0 0 24 24"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth={2}
+                  d="M17 8l4 4m0 0l-4 4m4-4H3"
+                />
              </svg>
            </>
          )}
        </Button>
-        
+
        <p className="text-[7px] text-center text-text-secondary/40 uppercase tracking-[0.15em] font-medium px-2 !mt-1 !mb-0">
          {t('privacyNote')}
        </p>
--- a/components/analytics/AnalyticsProvider.tsx
+++ b/components/analytics/AnalyticsProvider.tsx
@@ -3,7 +3,6 @@
 import { useEffect } from 'react';
 import { usePathname, useSearchParams } from 'next/navigation';
 import { getAppServices } from '@/lib/services/create-services';
-import Script from 'next/script';

 /**
 * AnalyticsProvider Component
@@ -11,49 +10,35 @@ import Script from 'next/script';
 * Automatically tracks pageviews on client-side route changes.
 * This component should be placed inside your layout to handle navigation events.
 *
+ * @param {Object} props - Component props
+ * @param {string} [props.websiteId] - The Umami website ID (passed from server config)
+ *
 * @example
 * ```tsx
 * // In your layout.tsx
- * <NextIntlClientProvider messages={messages} locale={locale}>
- *   <UmamiScript />
- *   <Header />
- *   <main>{children}</main>
- *   <Footer />
- *   <AnalyticsProvider />
- * </NextIntlClientProvider>
+ * const { websiteId } = config.analytics.umami;
+ * <AnalyticsProvider websiteId={websiteId} />
 * ```
 */
-export default function AnalyticsProvider() {
+export default function AnalyticsProvider({ websiteId }: { websiteId?: string }) {
  const pathname = usePathname();
  const searchParams = useSearchParams();

  useEffect(() => {
    if (!pathname) return;
-    
+
    const services = getAppServices();
    const url = `${pathname}${searchParams?.size ? `?${searchParams.toString()}` : ''}`;
-    
+
    // Track pageview with the full URL
    services.analytics.trackPageview(url);
-    
+
    if (process.env.NODE_ENV === 'development') {
      console.log('[Umami] Tracked pageview:', url);
    }
  }, [pathname, searchParams]);

-  const websiteId = process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID;
  if (!websiteId) return null;

-  return (
-    <Script
-      id="umami-analytics"
-      src="/stats/script.js"
-      data-website-id={websiteId}
-      data-host-url="/stats"
-      strategy="afterInteractive"
-      data-domains="klz-cables.com"
-      defer
-    />
-  );
+  return null;
 }
-
--- a/components/ui/Button.tsx
+++ b/components/ui/Button.tsx
@@ -3,24 +3,43 @@ import Link from 'next/link';
 import { cn } from './utils';

 export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
-  variant?: 'primary' | 'secondary' | 'accent' | 'saturated' | 'outline' | 'ghost' | 'white';
+  variant?:
+    | 'primary'
+    | 'secondary'
+    | 'accent'
+    | 'saturated'
+    | 'outline'
+    | 'ghost'
+    | 'white'
+    | 'destructive';
  size?: 'sm' | 'md' | 'lg' | 'xl';
  href?: string;
  className?: string;
  children?: React.ReactNode;
 }

-export function Button({ className, variant = 'primary', size = 'md', href, ...props }: ButtonProps) {
-  const baseStyles = 'inline-flex items-center justify-center rounded-full font-semibold transition-all duration-500 ease-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none active:scale-95 hover:-translate-y-1 hover:scale-[1.02] relative overflow-hidden group/btn isolate';
-  
+export function Button({
+  className,
+  variant = 'primary',
+  size = 'md',
+  href,
+  ...props
+}: ButtonProps) {
+  const baseStyles =
+    'inline-flex items-center justify-center rounded-full font-semibold transition-all duration-500 ease-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none active:scale-95 hover:-translate-y-1 hover:scale-[1.02] relative overflow-hidden group/btn isolate';
+
  const variants = {
    primary: 'bg-primary text-white shadow-md hover:shadow-primary/30 hover:shadow-2xl',
    secondary: 'bg-secondary text-white shadow-md hover:shadow-secondary/30 hover:shadow-2xl',
    accent: 'bg-accent text-primary-dark shadow-md hover:shadow-accent/30 hover:shadow-2xl',
    saturated: 'bg-saturated text-white shadow-md hover:shadow-primary/30 hover:shadow-2xl',
-    outline: 'border-2 border-primary bg-transparent text-primary hover:text-white hover:shadow-primary/20 hover:shadow-xl',
+    outline:
+      'border-2 border-primary bg-transparent text-primary hover:text-white hover:shadow-primary/20 hover:shadow-xl',
    ghost: 'text-primary hover:shadow-lg',
-    white: 'bg-white text-primary shadow-md hover:shadow-primary/30 hover:shadow-2xl hover:text-white',
+    white:
+      'bg-white text-primary shadow-md hover:shadow-primary/30 hover:shadow-2xl hover:text-white',
+    destructive:
+      'bg-destructive text-destructive-foreground shadow-md hover:shadow-destructive/30 hover:shadow-2xl',
  };

  const sizes = {
@@ -40,20 +59,25 @@ export function Button({ className, variant = 'primary', size = 'md', href, ...p
    outline: 'bg-primary',
    ghost: 'bg-primary-light/10',
    white: 'bg-primary-light',
+    destructive: 'bg-destructive/90',
  };

  const content = (
    <>
-      <span className={cn(
-        "relative z-10 flex items-center justify-center gap-2 transition-colors duration-500",
-        variant === 'white' ? "group-hover/btn:text-primary-dark" : ""
-      )}>
+      <span
+        className={cn(
+          'relative z-10 flex items-center justify-center gap-2 transition-colors duration-500',
+          variant === 'white' ? 'group-hover/btn:text-primary-dark' : '',
+        )}
+      >
        {props.children}
      </span>
-      <span className={cn(
-        "absolute inset-0 translate-y-[101%] group-hover/btn:translate-y-0 transition-transform duration-500 ease-out",
-        overlayColors[variant]
-      )} />
+      <span
+        className={cn(
+          'absolute inset-0 translate-y-[101%] group-hover/btn:translate-y-0 transition-transform duration-500 ease-out',
+          overlayColors[variant],
+        )}
+      />
    </>
  );

--- a/cookies.txt
+++ b/cookies.txt
@@ -0,0 +1,4 @@
+# Netscape HTTP Cookie File
+# https://curl.se/docs/http-cookies.html
+# This file was generated by libcurl! Edit at your own risk.
+
--- a/data/excel/medium-voltage-KM
+++ b/data/excel/medium-voltage-KM
--- a/data/excel/medium-voltage-KM.xlsx
+++ b/data/excel/medium-voltage-KM.xlsx
--- a/data/products/de/na2xsf2y.mdx
+++ b/data/products/de/na2xsf2y.mdx
@@ -398,6 +398,24 @@ locale: de
            "55",
            "4195"
          ]
+        },
+        {
+          "configuration": "1x1200/35",
+          "cells": [
+            "Al",
+            "RM",
+            "0,95",
+            "48,5",
+            "0,0247",
+            "3,4",
+            "Auf Anfrage",
+            "Auf Anfrage",
+            "113",
+            "2,4",
+            "885",
+            "59",
+            "4800"
+          ]
        }
      ]
    },
@@ -737,6 +755,24 @@ locale: de
            "60",
            "4634"
          ]
+        },
+        {
+          "configuration": "1x1200/35",
+          "cells": [
+            "Al",
+            "RM",
+            "1,05",
+            "52,3",
+            "0,0247",
+            "5,5",
+            "Auf Anfrage",
+            "Auf Anfrage",
+            "113",
+            "2,4",
+            "990",
+            "66",
+            "5200"
+          ]
        }
      ]
    },
@@ -1076,6 +1112,24 @@ locale: de
            "65",
            "5093"
          ]
+        },
+        {
+          "configuration": "1x1200/35",
+          "cells": [
+            "Al",
+            "RM",
+            "1,15",
+            "57,5",
+            "0,0247",
+            "8,0",
+            "Auf Anfrage",
+            "Auf Anfrage",
+            "113",
+            "2,4",
+            "1065",
+            "71",
+            "5900"
+          ]
        }
      ]
    }
--- a/data/products/en/na2xsf2y.mdx
+++ b/data/products/en/na2xsf2y.mdx
@@ -398,6 +398,24 @@ locale: en
            "55",
            "4195"
          ]
+        },
+        {
+          "configuration": "1x1200/35",
+          "cells": [
+            "Al",
+            "RM",
+            "0.95",
+            "48.5",
+            "0.0247",
+            "3.4",
+            "On Request",
+            "On Request",
+            "113",
+            "2.4",
+            "885",
+            "59",
+            "4800"
+          ]
        }
      ]
    },
@@ -737,6 +755,24 @@ locale: en
            "60",
            "4634"
          ]
+        },
+        {
+          "configuration": "1x1200/35",
+          "cells": [
+            "Al",
+            "RM",
+            "1.05",
+            "52.3",
+            "0.0247",
+            "5.5",
+            "On Request",
+            "On Request",
+            "113",
+            "2.4",
+            "990",
+            "66",
+            "5200"
+          ]
        }
      ]
    },
@@ -1076,6 +1112,24 @@ locale: en
            "65",
            "5093"
          ]
+        },
+        {
+          "configuration": "1x1200/35",
+          "cells": [
+            "Al",
+            "RM",
+            "1.15",
+            "57.5",
+            "0.0247",
+            "8",
+            "On Request",
+            "On Request",
+            "113",
+            "2.4",
+            "1065",
+            "71",
+            "5900"
+          ]
        }
      ]
    }
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -9,18 +9,27 @@ services:
      NODE_ENV: development
      # Docker Internal Communication
      DIRECTUS_URL: http://directus:8055
+    ports:
+      - "3000:3000"
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.klz-app-local.rule=Host(`klz.localhost`)"
-      - "traefik.http.routers.klz-app-local.entrypoints=web"
-      - "traefik.http.routers.klz-app-local.service=klz-cables"
+      # Clear all production-related TLS/Middleware settings for the main routers
+      - "traefik.http.routers.klz-cables.entrypoints=web"
+      - "traefik.http.routers.klz-cables.rule=Host(`klz.localhost`)"
+      - "traefik.http.routers.klz-cables.tls=false"
+      - "traefik.http.routers.klz-cables.middlewares="
+
+      - "traefik.http.routers.klz-cables-web.entrypoints=web"
+      - "traefik.http.routers.klz-cables-web.rule=Host(`klz.localhost`)"
+      - "traefik.http.routers.klz-cables-web.middlewares="

  directus:
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.klz-directus-local.rule=Host(`cms.klz.localhost`)"
-      - "traefik.http.routers.klz-directus-local.entrypoints=web"
-      - "traefik.http.routers.klz-directus-local.service=klz-directus"
+      - "traefik.http.routers.klz-cables-directus.entrypoints=web"
+      - "traefik.http.routers.klz-cables-directus.rule=Host(`cms.klz.localhost`)"
+      - "traefik.http.routers.klz-cables-directus.tls=false"
+      - "traefik.http.routers.klz-cables-directus.middlewares="
    ports:
      - "8055:8055"
    environment:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,35 +1,96 @@
 services:
-  app:
+  klz-app:
    image: registry.infra.mintel.me/mintel/klz-cables.com:${IMAGE_TAG:-latest}
    restart: always
    networks:
-      - infra
+      - default
    env_file:
      - ${ENV_FILE:-.env}
+    labels:
+      - "traefik.enable=false"
+
+  varnish:
+    image: varnish:7
+    restart: always
+    networks:
+      - default
+      - infra
+    volumes:
+      - ./varnish/default.vcl:/etc/varnish/default.vcl:ro
+    tmpfs:
+      - /var/lib/varnish:exec,mode=1777
+    environment:
+      VARNISH_SIZE: ${VARNISH_CACHE_SIZE:-256M}
+      APP_VERSION: ${IMAGE_TAG:-latest}
    labels:
      - "traefik.enable=true"
      # HTTP ⇒ HTTPS redirect
-      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-web.rule=Host(${TRAEFIK_HOST}) && !PathPrefix(`/.well-known/acme-challenge/`)"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-web.rule=Host(`${TRAEFIK_HOST}`) && !PathPrefix(`/.well-known/acme-challenge/`)"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-web.entrypoints=web"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-web.middlewares=redirect-https"
-      # HTTPS router
-      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}.rule=Host(${TRAEFIK_HOST})"
+      # HTTPS router (Protected)
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}.rule=Host(`${TRAEFIK_HOST}`) && !PathPrefix(`/stats`, `/errors`)"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}.entrypoints=websecure"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}.tls.certresolver=le"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}.tls=true"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}.service=${PROJECT_NAME:-klz-cables}"
-      - "traefik.http.services.${PROJECT_NAME:-klz-cables}.loadbalancer.server.port=3000"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}.middlewares=${PROJECT_NAME:-klz-cables}-ratelimit,${PROJECT_NAME:-klz-cables}-forward,${AUTH_MIDDLEWARE:-compress}"
+
+      # HTTPS router (Unprotected - for Analytics & Errors)
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-unprotected.rule=Host(`${TRAEFIK_HOST}`) && PathPrefix(`/stats`, `/errors`)"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-unprotected.entrypoints=websecure"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-unprotected.tls.certresolver=le"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-unprotected.tls=true"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-unprotected.service=${PROJECT_NAME:-klz-cables}"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-unprotected.middlewares=${PROJECT_NAME:-klz-cables}-ratelimit,${PROJECT_NAME:-klz-cables}-forward,compress"
+
+      - "traefik.http.services.${PROJECT_NAME:-klz-cables}.loadbalancer.server.port=80"
      - "traefik.http.services.${PROJECT_NAME:-klz-cables}.loadbalancer.server.scheme=http"
+      - "traefik.docker.network=infra"
+
+      # Gatekeeper Router (to show the login page)
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-gatekeeper.rule=Host(`gatekeeper.${TRAEFIK_HOST}`)"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-gatekeeper.entrypoints=websecure"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-gatekeeper.tls.certresolver=le"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-gatekeeper.tls=true"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-gatekeeper.service=${PROJECT_NAME:-klz-cables}-gatekeeper"
+
      # Forwarded Headers
      - "traefik.http.middlewares.${PROJECT_NAME:-klz-cables}-forward.headers.customrequestheaders.X-Forwarded-Proto=https"
      - "traefik.http.middlewares.${PROJECT_NAME:-klz-cables}-forward.headers.customrequestheaders.X-Forwarded-Ssl=on"
-      # Middlewares
-      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}.middlewares=${PROJECT_NAME:-klz-cables}-forward,compress"
+
+      # Middleware Definitions
+      - "traefik.http.middlewares.${PROJECT_NAME:-klz-cables}-ratelimit.ratelimit.average=100"
+      - "traefik.http.middlewares.${PROJECT_NAME:-klz-cables}-ratelimit.ratelimit.burst=50"
+      - "traefik.http.middlewares.${PROJECT_NAME:-klz-cables}-auth.forwardauth.address=http://${PROJECT_NAME}-gatekeeper:3000/api/verify"
+      - "traefik.http.middlewares.${PROJECT_NAME:-klz-cables}-auth.forwardauth.trustForwardHeader=true"
+      - "traefik.http.middlewares.${PROJECT_NAME:-klz-cables}-auth.forwardauth.authResponseHeaders=X-Auth-User"
+
+  gatekeeper:
+    image: registry.infra.mintel.me/mintel/gatekeeper:latest
+    container_name: ${PROJECT_NAME:-klz-cables}-gatekeeper
+    restart: always
+    networks:
+      - default
+      - infra
+    env_file:
+      - ${ENV_FILE:-.env}
+    environment:
+      PORT: 3000
+      COOKIE_DOMAIN: ${COOKIE_DOMAIN}
+      AUTH_COOKIE_NAME: klz_gatekeeper_session
+      NEXT_PUBLIC_BASE_URL: https://gatekeeper.${TRAEFIK_HOST}
+      GATEKEEPER_PASSWORD: ${GATEKEEPER_PASSWORD:-klz2026}
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.${PROJECT_NAME:-klz-cables}-gatekeeper.loadbalancer.server.port=3000"
+      - "traefik.docker.network=infra"

  directus:
    image: directus/directus:11
    restart: always
    networks:
+      - default
      - infra
    env_file:
      - ${ENV_FILE:-.env}
@@ -46,22 +107,28 @@ services:
      DB_PASSWORD: ${DIRECTUS_DB_PASSWORD:-directus}
      WEBSOCKETS_ENABLED: 'true'
      PUBLIC_URL: ${DIRECTUS_URL:-https://cms.klz-cables.com}
+      # Error Tracking
+      SENTRY_DSN: ${SENTRY_DSN}
+      SENTRY_ENVIRONMENT: ${TARGET:-development}
+      LOGGER_LEVEL: ${LOG_LEVEL:-info}
    volumes:
      - ./directus/uploads:/directus/uploads
      - ./directus/extensions:/directus/extensions
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-directus.rule=Host(${DIRECTUS_HOST})"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-directus.rule=Host(`${DIRECTUS_HOST}`)"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-directus.entrypoints=websecure"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-directus.tls.certresolver=le"
      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-directus.tls=true"
+      - "traefik.http.routers.${PROJECT_NAME:-klz-cables}-directus.middlewares=${PROJECT_NAME:-klz-cables}-forward,compress"
      - "traefik.http.services.${PROJECT_NAME:-klz-cables}-directus.loadbalancer.server.port=8055"
+      - "traefik.docker.network=infra"

  directus-db:
    image: postgres:15-alpine
    restart: always
    networks:
-      - infra
+      - default
    env_file:
      - ${ENV_FILE:-.env}
    environment:
@@ -72,6 +139,8 @@ services:
      - directus-db-data:/var/lib/postgresql/data

 networks:
+  default:
+    name: ${PROJECT_NAME:-klz-cables}-internal
  infra:
    external: true

--- a/docs/DEPLOYMENT.md
+++ b/docs/DEPLOYMENT.md
@@ -42,15 +42,15 @@ The application uses a clean, robust, **fully automated** environment variable s

 ## Environment Variables

-### Build-Time Variables (NEXT_PUBLIC_*)
+### Build-Time Variables (NEXT*PUBLIC*\*)

 These are embedded into the JavaScript bundle during build and are visible to the client:

-| Variable | Required | Description |
-|----------|----------|-------------|
-| `NEXT_PUBLIC_BASE_URL` | ✅ Yes | Base URL of the application (e.g., `https://klz-cables.com`) |
-| `NEXT_PUBLIC_UMAMI_WEBSITE_ID` | ❌ No | Umami analytics website ID |
-| `NEXT_PUBLIC_UMAMI_SCRIPT_URL` | ❌ No | Umami analytics script URL (default: `https://analytics.infra.mintel.me/script.js`) |
+| Variable               | Required | Description                                                  |
+| ---------------------- | -------- | ------------------------------------------------------------ |
+| `NEXT_PUBLIC_BASE_URL` | ✅ Yes   | Base URL of the application (e.g., `https://klz-cables.com`) |
+| `UMAMI_WEBSITE_ID`     | ❌ No    | Umami analytics website ID (passed as prop)                  |
+| `UMAMI_API_ENDPOINT`   | ❌ No    | Backend-only Umami analytics API target (internal)           |

 **Important**: These must be provided as `--build-arg` when building the Docker image.

@@ -58,38 +58,40 @@ These are embedded into the JavaScript bundle during build and are visible to th

 These are loaded from the `.env` file at runtime and are only available on the server:

-| Variable | Required | Description |
-|----------|----------|-------------|
-| `NODE_ENV` | ✅ Yes | Environment mode (`production`, `development`, `test`) |
-| `SENTRY_DSN` | ❌ No | GlitchTip/Sentry error tracking DSN |
-| `MAIL_HOST` | ❌ No | SMTP server hostname |
-| `MAIL_PORT` | ❌ No | SMTP server port (default: `587`) |
-| `MAIL_USERNAME` | ❌ No | SMTP authentication username |
-| `MAIL_PASSWORD` | ❌ No | SMTP authentication password |
-| `MAIL_FROM` | ❌ No | Email sender address |
-| `MAIL_RECIPIENTS` | ❌ No | Comma-separated list of recipient emails |
-| `REDIS_URL` | ❌ No | Redis connection URL (e.g., `redis://redis:6379/2`) |
-| `REDIS_KEY_PREFIX` | ❌ No | Redis key prefix (default: `klz:`) |
-| `STRAPI_DATABASE_NAME` | ✅ Yes | Strapi database name |
-| `STRAPI_DATABASE_USERNAME` | ✅ Yes | Strapi database username |
-| `STRAPI_DATABASE_PASSWORD` | ✅ Yes | Strapi database password |
-| `STRAPI_URL` | ✅ Yes | URL of the Strapi CMS |
-| `APP_KEYS` | ✅ Yes | Strapi application keys (comma-separated) |
-| `API_TOKEN_SALT` | ✅ Yes | Strapi API token salt |
-| `ADMIN_JWT_SECRET` | ✅ Yes | Strapi admin JWT secret |
-| `TRANSFER_TOKEN_SALT` | ✅ Yes | Strapi transfer token salt |
-| `JWT_SECRET` | ✅ Yes | Strapi JWT secret |
+| Variable                   | Required | Description                                            |
+| -------------------------- | -------- | ------------------------------------------------------ |
+| `NODE_ENV`                 | ✅ Yes   | Environment mode (`production`, `development`, `test`) |
+| `SENTRY_DSN`               | ❌ No    | GlitchTip/Sentry error tracking DSN                    |
+| `MAIL_HOST`                | ❌ No    | SMTP server hostname                                   |
+| `MAIL_PORT`                | ❌ No    | SMTP server port (default: `587`)                      |
+| `MAIL_USERNAME`            | ❌ No    | SMTP authentication username                           |
+| `MAIL_PASSWORD`            | ❌ No    | SMTP authentication password                           |
+| `MAIL_FROM`                | ❌ No    | Email sender address                                   |
+| `MAIL_RECIPIENTS`          | ❌ No    | Comma-separated list of recipient emails               |
+| `REDIS_URL`                | ❌ No    | Redis connection URL (e.g., `redis://redis:6379/2`)    |
+| `REDIS_KEY_PREFIX`         | ❌ No    | Redis key prefix (default: `klz:`)                     |
+| `STRAPI_DATABASE_NAME`     | ✅ Yes   | Strapi database name                                   |
+| `STRAPI_DATABASE_USERNAME` | ✅ Yes   | Strapi database username                               |
+| `STRAPI_DATABASE_PASSWORD` | ✅ Yes   | Strapi database password                               |
+| `STRAPI_URL`               | ✅ Yes   | URL of the Strapi CMS                                  |
+| `APP_KEYS`                 | ✅ Yes   | Strapi application keys (comma-separated)              |
+| `API_TOKEN_SALT`           | ✅ Yes   | Strapi API token salt                                  |
+| `ADMIN_JWT_SECRET`         | ✅ Yes   | Strapi admin JWT secret                                |
+| `TRANSFER_TOKEN_SALT`      | ✅ Yes   | Strapi transfer token salt                             |
+| `JWT_SECRET`               | ✅ Yes   | Strapi JWT secret                                      |

 ## Local Development

 ### Setup

 1. Copy the example environment file:
+
   ```bash
   cp .env.example .env
   ```

 2. Edit `.env` and fill in your local configuration:
+
   ```bash
   NODE_ENV=development
   NEXT_PUBLIC_BASE_URL=http://localhost:3000
@@ -97,6 +99,7 @@ These are loaded from the `.env` file at runtime and are only available on the s
   ```

 3. Install dependencies:
+
   ```bash
   npm install
   ```
@@ -112,8 +115,8 @@ These are loaded from the `.env` file at runtime and are only available on the s
 # Build with build-time arguments
 docker build \
  --build-arg NEXT_PUBLIC_BASE_URL=http://localhost:3000 \
-  --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID=your-id \
-  --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js \
+  --build-arg UMAMI_WEBSITE_ID=your-id \
+  --build-arg UMAMI_API_ENDPOINT=https://analytics.infra.mintel.me \
  -t klz-cables:local .

 # Run with runtime environment file
@@ -138,8 +141,8 @@ docker run --env-file .env -p 3000:3000 klz-cables:local

   **Build-Time Variables:**
   - `NEXT_PUBLIC_BASE_URL` - Production URL (e.g., `https://klz-cables.com`)
-   - `NEXT_PUBLIC_UMAMI_WEBSITE_ID` - Umami analytics ID
-   - `NEXT_PUBLIC_UMAMI_SCRIPT_URL` - Umami script URL
+   - `UMAMI_WEBSITE_ID` - Umami analytics ID
+   - `UMAMI_API_ENDPOINT` - Umami API endpoint

   **Runtime Variables:**
   - `SENTRY_DSN` - Error tracking DSN
@@ -209,11 +212,12 @@ docker-compose logs -f app
 **Problem**: Build fails with "Environment validation failed"

 **Solution**: Ensure all required `NEXT_PUBLIC_*` variables are provided as build arguments:
+
 ```bash
 docker build \
  --build-arg NEXT_PUBLIC_BASE_URL=https://klz-cables.com \
-  --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID=your-id \
-  --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js \
+  --build-arg UMAMI_WEBSITE_ID=your-id \
+  --build-arg UMAMI_API_ENDPOINT=https://analytics.infra.mintel.me \
  -t klz-cables .
 ```

@@ -222,6 +226,7 @@ docker build \
 **Problem**: Container starts but application crashes

 **Solution**: Check that the `.env` file exists and contains all required runtime variables:
+
 ```bash
 # On the server
 cat /home/deploy/sites/klz-cables.com/.env
@@ -235,9 +240,11 @@ docker-compose logs app
 **Problem**: Features not working (email, analytics, etc.)

 **Solution**:
+
 1. Check that the secret is configured in Gitea
 2. Verify the workflow includes it in the `.env` generation (see `.gitea/workflows/deploy.yml`)
 3. Redeploy to regenerate the `.env` file:
+
   ```bash
   git commit --allow-empty -m "Trigger redeploy"
   git push origin main
@@ -255,6 +262,7 @@ docker-compose logs app
 **Problem**: `docker-compose up` fails with "env file not found"

 **Solution**: The `.env` file should be automatically created by the workflow. If it's missing:
+
 1. Check the workflow logs for errors in the "📝 Preparing environment configuration" step
 2. Manually trigger a deployment by pushing to main
 3. If still missing, check server permissions and disk space
@@ -264,6 +272,7 @@ docker-compose logs app
 **Problem**: Container can't connect to Traefik

 **Solution**: Verify the `infra` network exists:
+
 ```bash
 docker network ls | grep infra
 docker network inspect infra
--- a/docs/ENV_MIGRATION.md
+++ b/docs/ENV_MIGRATION.md
@@ -7,29 +7,31 @@ This guide helps you migrate from the old fragile environment variable setup to
 ### Before (Fragile & Overkill)

 ❌ **Problems:**
+
 - Environment variables passed individually via SSH (12+ vars)
 - Duplicate definitions in Dockerfile, docker-compose.yml, and deploy.yml
- Build args included runtime-only variables (SENTRY_DSN, MAIL_*, REDIS_*)
+- Build args included runtime-only variables (SENTRY*DSN, MAIL*_, REDIS\__)
 - No single source of truth
 - Difficult to maintain and error-prone

 ```yaml
 # Old deploy.yml - FRAGILE!
 ssh root@alpha.mintel.me \
-  "MAIL_FROM='${{ secrets.MAIL_FROM }}' \
-   MAIL_HOST='${{ secrets.MAIL_HOST }}' \
-   MAIL_PASSWORD='${{ secrets.MAIL_PASSWORD }}' \
-   MAIL_PORT='${{ secrets.MAIL_PORT }}' \
-   MAIL_RECIPIENTS='${{ secrets.MAIL_RECIPIENTS }}' \
-   MAIL_USERNAME='${{ secrets.MAIL_USERNAME }}' \
-   NEXT_PUBLIC_BASE_URL='${{ secrets.NEXT_PUBLIC_BASE_URL }}' \
-   ... (12+ variables) \
-   /home/deploy/deploy.sh"
+"MAIL_FROM='${{ secrets.MAIL_FROM }}' \
+MAIL_HOST='${{ secrets.MAIL_HOST }}' \
+MAIL_PASSWORD='${{ secrets.MAIL_PASSWORD }}' \
+MAIL_PORT='${{ secrets.MAIL_PORT }}' \
+MAIL_RECIPIENTS='${{ secrets.MAIL_RECIPIENTS }}' \
+MAIL_USERNAME='${{ secrets.MAIL_USERNAME }}' \
+NEXT_PUBLIC_BASE_URL='${{ secrets.NEXT_PUBLIC_BASE_URL }}' \
+... (12+ variables) \
+/home/deploy/deploy.sh"
 ```

 ### After (Clean & Robust)

 ✅ **Benefits:**
+
 - Single `.env` file on server contains all runtime variables
 - Only `NEXT_PUBLIC_*` variables passed as build args (3 vars)
 - Clear separation: build-time vs runtime
@@ -46,6 +48,7 @@ ssh root@alpha.mintel.me "/home/deploy/deploy.sh"
 ### Step 1: Update Gitea Secrets

 **Remove these secrets** (no longer needed in CI/CD):
+
 - ❌ `MAIL_FROM`
 - ❌ `MAIL_HOST`
 - ❌ `MAIL_PASSWORD`
@@ -58,9 +61,11 @@ ssh root@alpha.mintel.me "/home/deploy/deploy.sh"
 - ❌ `SENTRY_DSN` (from build args)

 **Keep these secrets** (still needed for build):
+
 - ✅ `NEXT_PUBLIC_BASE_URL`
- ✅ `NEXT_PUBLIC_UMAMI_WEBSITE_ID`
- ✅ `NEXT_PUBLIC_UMAMI_SCRIPT_URL`
+- ✅ `NEXT_PUBLIC_BASE_URL`
+- ✅ `UMAMI_WEBSITE_ID`
+- ✅ `UMAMI_API_ENDPOINT`
 - ✅ `REGISTRY_USER`
 - ✅ `REGISTRY_PASS`
 - ✅ `ALPHA_SSH_KEY`
@@ -81,8 +86,8 @@ NODE_ENV=production
 NEXT_PUBLIC_BASE_URL=https://klz-cables.com

 # Analytics
-NEXT_PUBLIC_UMAMI_WEBSITE_ID=your-actual-id
-NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
+UMAMI_WEBSITE_ID=your-actual-id
+UMAMI_API_ENDPOINT=https://analytics.infra.mintel.me

 # Error Tracking
 SENTRY_DSN=your-actual-dsn
@@ -168,6 +173,7 @@ git push origin main
 ```

 The CI/CD workflow will:
+
 1. Build with only `NEXT_PUBLIC_*` build args
 2. Push to registry
 3. SSH to server and run deploy.sh
@@ -197,21 +203,22 @@ curl -I https://klz-cables.com

 ## Comparison Table

-| Aspect | Before | After |
-|--------|--------|-------|
-| **Gitea Secrets** | 15+ secrets | 8 secrets |
-| **Build Args** | 4 vars (including runtime-only) | 3 vars (NEXT_PUBLIC_* only) |
-| **Runtime Vars** | Passed via SSH command | Loaded from .env file |
-| **Maintenance** | Update in 3 places | Update in 1 place |
-| **Security** | Secrets in CI logs | Secrets only on server |
-| **Clarity** | Confusing duplication | Clear separation |
-| **Robustness** | Fragile SSH command | Robust file-based config |
+| Aspect            | Before                          | After                        |
+| ----------------- | ------------------------------- | ---------------------------- |
+| **Gitea Secrets** | 15+ secrets                     | 8 secrets                    |
+| **Build Args**    | 4 vars (including runtime-only) | 3 vars (NEXT*PUBLIC*\* only) |
+| **Runtime Vars**  | Passed via SSH command          | Loaded from .env file        |
+| **Maintenance**   | Update in 3 places              | Update in 1 place            |
+| **Security**      | Secrets in CI logs              | Secrets only on server       |
+| **Clarity**       | Confusing duplication           | Clear separation             |
+| **Robustness**    | Fragile SSH command             | Robust file-based config     |

 ## Rollback Plan

 If you need to rollback to the old system:

 1. Revert the changes in git:
+
   ```bash
   git revert HEAD
   git push origin main
@@ -229,7 +236,8 @@ A: `NEXT_PUBLIC_*` variables are special in Next.js - they're embedded into the

 **Q: Can I update environment variables without rebuilding?**

-A: Yes, for runtime-only variables (MAIL_*, REDIS_*, SENTRY_DSN, etc.). Just edit the `.env` file on the server and restart containers:
+A: Yes, for runtime-only variables (MAIL*\*, REDIS*\*, SENTRY_DSN, etc.). Just edit the `.env` file on the server and restart containers:
+
 ```bash
 nano /home/deploy/sites/klz-cables.com/.env
 docker-compose down && docker-compose up -d
@@ -240,6 +248,7 @@ For `NEXT_PUBLIC_*` variables, you need to rebuild the Docker image since they'r
 **Q: Where should I store the .env file backup?**

 A: Keep a secure backup outside the server:
+
 ```bash
 # Download from server
 scp root@alpha.mintel.me:/home/deploy/sites/klz-cables.com/.env \
@@ -250,7 +259,8 @@ scp root@alpha.mintel.me:/home/deploy/sites/klz-cables.com/.env \

 **Q: What if I accidentally commit .env to git?**

-A: 
+A:
+
 1. Remove it immediately: `git rm .env && git commit -m "Remove .env"`
 2. Rotate all credentials in the file
 3. Update the `.gitignore` to ensure it doesn't happen again (already done)
@@ -267,6 +277,7 @@ If you encounter issues during migration:
 ## Summary

 The new system is:
+
 - ✅ **Simpler**: One .env file instead of scattered variables
 - ✅ **Cleaner**: Clear separation of build vs runtime
 - ✅ **Robust**: File-based config instead of fragile SSH commands
--- a/lib/blog.ts
+++ b/lib/blog.ts
@@ -41,11 +41,11 @@ export async function getPostBySlug(slug: string, locale: string): Promise<PostM
 export async function getAllPosts(locale: string): Promise<PostMdx[]> {
  const postsDir = path.join(process.cwd(), 'data', 'blog', locale);
  if (!fs.existsSync(postsDir)) return [];
-  
+
  const files = fs.readdirSync(postsDir);
  const posts = files
-    .filter(file => file.endsWith('.mdx'))
-    .map(file => {
+    .filter((file) => file.endsWith('.mdx'))
+    .map((file) => {
      const filePath = path.join(postsDir, file);
      const fileContent = fs.readFileSync(filePath, 'utf8');
      const { data, content } = matter(fileContent);
@@ -55,14 +55,42 @@ export async function getAllPosts(locale: string): Promise<PostMdx[]> {
        content,
      };
    })
-    .sort((a, b) => new Date(b.frontmatter.date).getTime() - new Date(a.frontmatter.date).getTime());
+    .sort(
+      (a, b) => new Date(b.frontmatter.date).getTime() - new Date(a.frontmatter.date).getTime(),
+    );

  return posts;
 }

-export async function getAdjacentPosts(slug: string, locale: string): Promise<{ prev: PostMdx | null; next: PostMdx | null }> {
+export async function getAllPostsMetadata(locale: string): Promise<Partial<PostMdx>[]> {
+  const postsDir = path.join(process.cwd(), 'data', 'blog', locale);
+  if (!fs.existsSync(postsDir)) return [];
+
+  const files = fs.readdirSync(postsDir);
+  return files
+    .filter((file) => file.endsWith('.mdx'))
+    .map((file) => {
+      const filePath = path.join(postsDir, file);
+      const fileContent = fs.readFileSync(filePath, 'utf8');
+      const { data } = matter(fileContent);
+      return {
+        slug: file.replace(/\.mdx$/, ''),
+        frontmatter: data as PostFrontmatter,
+      };
+    })
+    .sort(
+      (a, b) =>
+        new Date(b.frontmatter.date as string).getTime() -
+        new Date(a.frontmatter.date as string).getTime(),
+    );
+}
+
+export async function getAdjacentPosts(
+  slug: string,
+  locale: string,
+): Promise<{ prev: PostMdx | null; next: PostMdx | null }> {
  const posts = await getAllPosts(locale);
-  const currentIndex = posts.findIndex(post => post.slug === slug);
+  const currentIndex = posts.findIndex((post) => post.slug === slug);

  if (currentIndex === -1) {
    return { prev: null, next: null };
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -13,20 +13,22 @@ let memoizedConfig: ReturnType<typeof createConfig> | undefined;
 function createConfig() {
  const env = envSchema.parse(getRawEnv());

+  const target = env.NEXT_PUBLIC_TARGET || env.TARGET;
+
  return {
    env: env.NODE_ENV,
-    isProduction: env.NODE_ENV === 'production',
-    isDevelopment: env.NODE_ENV === 'development',
-    isTest: env.NODE_ENV === 'test',
+    target,
+    isProduction: target === 'production' || !target,
+    isStaging: target === 'staging',
+    isTesting: target === 'testing',
+    isDevelopment: target === 'development',

    baseUrl: env.NEXT_PUBLIC_BASE_URL,

    analytics: {
      umami: {
        websiteId: env.NEXT_PUBLIC_UMAMI_WEBSITE_ID,
-        scriptUrl: env.NEXT_PUBLIC_UMAMI_SCRIPT_URL,
-        // The proxied path used in the frontend
-        proxyPath: '/stats/script.js',
+        apiEndpoint: env.UMAMI_API_ENDPOINT,
        enabled: Boolean(env.NEXT_PUBLIC_UMAMI_WEBSITE_ID),
      },
    },
@@ -62,8 +64,16 @@ function createConfig() {
      adminEmail: env.DIRECTUS_ADMIN_EMAIL,
      password: env.DIRECTUS_ADMIN_PASSWORD,
      token: env.DIRECTUS_API_TOKEN,
+      internalUrl: env.INTERNAL_DIRECTUS_URL,
      proxyPath: '/cms',
    },
+    notifications: {
+      gotify: {
+        url: env.GOTIFY_URL,
+        token: env.GOTIFY_TOKEN,
+        enabled: Boolean(env.GOTIFY_URL && env.GOTIFY_TOKEN),
+      },
+    },
  } as const;
 }

@@ -83,17 +93,48 @@ export function getConfig() {
 * Uses getters to ensure it's only initialized when accessed.
 */
 export const config = {
-  get env() { return getConfig().env; },
-  get isProduction() { return getConfig().isProduction; },
-  get isDevelopment() { return getConfig().isDevelopment; },
-  get isTest() { return getConfig().isTest; },
-  get baseUrl() { return getConfig().baseUrl; },
-  get analytics() { return getConfig().analytics; },
-  get errors() { return getConfig().errors; },
-  get cache() { return getConfig().cache; },
-  get logging() { return getConfig().logging; },
-  get mail() { return getConfig().mail; },
-  get directus() { return getConfig().directus; },
+  get env() {
+    return getConfig().env;
+  },
+  get target() {
+    return getConfig().target;
+  },
+  get isProduction() {
+    return getConfig().isProduction;
+  },
+  get isStaging() {
+    return getConfig().isStaging;
+  },
+  get isTesting() {
+    return getConfig().isTesting;
+  },
+  get isDevelopment() {
+    return getConfig().isDevelopment;
+  },
+  get baseUrl() {
+    return getConfig().baseUrl;
+  },
+  get analytics() {
+    return getConfig().analytics;
+  },
+  get errors() {
+    return getConfig().errors;
+  },
+  get cache() {
+    return getConfig().cache;
+  },
+  get logging() {
+    return getConfig().logging;
+  },
+  get mail() {
+    return getConfig().mail;
+  },
+  get directus() {
+    return getConfig().directus;
+  },
+  get notifications() {
+    return getConfig().notifications;
+  },
 };

 /**
@@ -109,7 +150,7 @@ export function getMaskedConfig() {
    analytics: {
      umami: {
        websiteId: mask(c.analytics.umami.websiteId),
-        scriptUrl: c.analytics.umami.scriptUrl,
+        apiEndpoint: c.analytics.umami.apiEndpoint,
        enabled: c.analytics.umami.enabled,
      },
    },
@@ -138,5 +179,12 @@ export function getMaskedConfig() {
      password: mask(c.directus.password),
      token: mask(c.directus.token),
    },
+    notifications: {
+      gotify: {
+        url: c.notifications.gotify.url,
+        token: mask(c.notifications.gotify.token),
+        enabled: c.notifications.gotify.enabled,
+      },
+    },
  };
 }
--- a/lib/directus.ts
+++ b/lib/directus.ts
@@ -1,92 +1,192 @@
-import { createDirectus, rest, authentication, readItems } from '@directus/sdk';
+import { createDirectus, rest, authentication, readItems, readCollections } from '@directus/sdk';
 import { config } from './config';
+import { getServerAppServices } from './services/create-services.server';

-const { url, adminEmail, password, token, proxyPath } = config.directus;
+const { url, adminEmail, password, token, proxyPath, internalUrl } = config.directus;

-const client = createDirectus(url)
-    .with(rest())
-    .with(authentication());
+// Use internal URL if on server to bypass Gatekeeper/Auth
+// Use proxy path in browser to stay on the same origin
+const effectiveUrl =
+  typeof window === 'undefined'
+    ? internalUrl || url
+    : typeof window !== 'undefined'
+      ? `${window.location.origin}${proxyPath}`
+      : proxyPath;
+
+const client = createDirectus(effectiveUrl).with(rest()).with(authentication());
+
+/**
+ * Helper to determine if we should show detailed errors
+ */
+const shouldShowDevErrors = config.isTesting || config.isDevelopment;
+
+/**
+ * Genericizes error messages for production/staging
+ */
+function formatError(error: any) {
+  if (shouldShowDevErrors) {
+    return error.errors?.[0]?.message || error.message || 'An unexpected error occurred.';
+  }
+  return 'A system error occurred. Our team has been notified.';
+}

 export async function ensureAuthenticated() {
-    if (token) {
-        client.setToken(token);
-        return;
-    }
-    if (adminEmail && password) {
-        try {
-            await client.login(adminEmail, password);
-        } catch (e) {
-            console.error("Failed to authenticate with Directus:", e);
-        }
+  if (token) {
+    client.setToken(token);
+    return;
+  }
+  if (adminEmail && password) {
+    try {
+      await client.login(adminEmail, password);
+    } catch (e) {
+      if (typeof window === 'undefined') {
+        getServerAppServices().errors.captureException(e, { part: 'directus_auth' });
+      }
+      console.error('Failed to authenticate with Directus:', e);
    }
+  }
 }

 /**
 * Maps the new translation-based schema back to the application's Product interface
 */
 function mapDirectusProduct(item: any, locale: string): any {
-    const langCode = locale === 'en' ? 'en-US' : 'de-DE';
-    const translation = item.translations?.find((t: any) => t.languages_code === langCode) || item.translations?.[0] || {};
+  const langCode = locale === 'en' ? 'en-US' : 'de-DE';
+  const translation =
+    item.translations?.find((t: any) => t.languages_code === langCode) ||
+    item.translations?.[0] ||
+    {};

-    return {
-        id: item.id,
-        sku: item.sku,
-        title: translation.name || '',
-        description: translation.description || '',
-        content: translation.content || '',
-        technicalData: {
-            technicalItems: translation.technical_items || [],
-            voltageTables: translation.voltage_tables || []
-        },
-        locale: locale,
-        // Use proxy URL for assets to avoid CORS and handle internal/external issues
-        data_sheet_url: item.data_sheet ? `${proxyPath}/assets/${item.data_sheet}` : null,
-        categories: (item.categories_link || []).map((c: any) => c.categories_id?.translations?.[0]?.name).filter(Boolean)
-    };
+  return {
+    id: item.id,
+    sku: item.sku,
+    title: translation.name || '',
+    description: translation.description || '',
+    content: translation.content || '',
+    technicalData: {
+      technicalItems: translation.technical_items || [],
+      voltageTables: translation.voltage_tables || [],
+    },
+    locale: locale,
+    // Use proxy URL for assets to avoid CORS and handle internal/external issues
+    data_sheet_url: item.data_sheet ? `${proxyPath}/assets/${item.data_sheet}` : null,
+    categories: (item.categories_link || [])
+      .map((c: any) => c.categories_id?.translations?.[0]?.name)
+      .filter(Boolean),
+  };
 }

 export async function getProducts(locale: string = 'de') {
-    await ensureAuthenticated();
-    try {
-        const items = await client.request(readItems('products', {
-            fields: [
-                '*',
-                'translations.*',
-                'categories_link.categories_id.translations.name'
-            ]
-        }));
-        return items.map(item => mapDirectusProduct(item, locale));
-    } catch (error) {
-        console.error('Error fetching products:', error);
-        return [];
+  await ensureAuthenticated();
+  try {
+    const items = await client.request(
+      readItems('products', {
+        fields: ['*', 'translations.*', 'categories_link.categories_id.translations.name'],
+      }),
+    );
+    return items.map((item) => mapDirectusProduct(item, locale));
+  } catch (error) {
+    if (typeof window === 'undefined') {
+      getServerAppServices().errors.captureException(error, { part: 'directus_get_products' });
    }
+    console.error('Error fetching products:', error);
+    return [];
+  }
 }

 export async function getProductBySlug(slug: string, locale: string = 'de') {
-    await ensureAuthenticated();
-    const langCode = locale === 'en' ? 'en-US' : 'de-DE';
-    try {
-        const items = await client.request(readItems('products', {
-            filter: {
-                translations: {
-                    slug: { _eq: slug },
-                    languages_code: { _eq: langCode }
-                }
-            },
-            fields: [
-                '*',
-                'translations.*',
-                'categories_link.categories_id.translations.name'
-            ],
-            limit: 1
-        }));
+  await ensureAuthenticated();
+  const langCode = locale === 'en' ? 'en-US' : 'de-DE';
+  try {
+    const items = await client.request(
+      readItems('products', {
+        filter: {
+          translations: {
+            slug: { _eq: slug },
+            languages_code: { _eq: langCode },
+          },
+        },
+        fields: ['*', 'translations.*', 'categories_link.categories_id.translations.name'],
+        limit: 1,
+      }),
+    );

-        if (!items || items.length === 0) return null;
-        return mapDirectusProduct(items[0], locale);
-    } catch (error) {
-        console.error(`Error fetching product ${slug}:`, error);
-        return null;
+    if (!items || items.length === 0) return null;
+    return mapDirectusProduct(items[0], locale);
+  } catch (error) {
+    if (typeof window === 'undefined') {
+      getServerAppServices().errors.captureException(error, {
+        part: 'directus_get_product_by_slug',
+        slug,
+      });
    }
+    console.error(`Error fetching product ${slug}:`, error);
+    return null;
+  }
+}
+
+export async function checkHealth() {
+  try {
+    // 1. Connectivity & Auth Check
+    try {
+      await ensureAuthenticated();
+      await client.request(readCollections());
+    } catch (e: any) {
+      if (typeof window === 'undefined') {
+        getServerAppServices().errors.captureException(e, { part: 'directus_health_auth' });
+      }
+      console.error('Directus authentication failed during health check:', e);
+      return {
+        status: 'error',
+        message: shouldShowDevErrors
+          ? 'Authentication failed. Check your DIRECTUS_ADMIN_EMAIL and DIRECTUS_ADMIN_PASSWORD.'
+          : 'CMS is currently unavailable due to an internal authentication error.',
+        code: 'AUTH_FAILED',
+        details: shouldShowDevErrors ? e.message : undefined,
+      };
+    }
+
+    // 2. Schema check (does the contact_submissions table exist?)
+    try {
+      await client.request(readItems('contact_submissions', { limit: 1 }));
+    } catch (e: any) {
+      if (typeof window === 'undefined') {
+        getServerAppServices().errors.captureException(e, { part: 'directus_health_schema' });
+      }
+      if (
+        e.message?.includes('does not exist') ||
+        e.code === 'INVALID_PAYLOAD' ||
+        e.status === 404
+      ) {
+        return {
+          status: 'error',
+          message: shouldShowDevErrors
+            ? `The "contact_submissions" collection is missing or inaccessible. Error: ${e.message || 'Unknown'}`
+            : 'Required data structures are currently unavailable.',
+          code: 'SCHEMA_MISSING',
+        };
+      }
+      return {
+        status: 'error',
+        message: shouldShowDevErrors
+          ? `Schema error: ${e.errors?.[0]?.message || e.message || 'Unknown error'}`
+          : 'The data schema is currently misconfigured.',
+        code: 'SCHEMA_ERROR',
+      };
+    }
+
+    return { status: 'ok', message: 'Directus is reachable and responding.' };
+  } catch (error: any) {
+    if (typeof window === 'undefined') {
+      getServerAppServices().errors.captureException(error, { part: 'directus_health_critical' });
+    }
+    console.error('Directus health check failed with unexpected error:', error);
+    return {
+      status: 'error',
+      message: formatError(error),
+      code: error.code || 'UNKNOWN',
+    };
+  }
 }

 export default client;
--- a/lib/env.test.ts
+++ b/lib/env.test.ts
@@ -0,0 +1,70 @@
+import { describe, it, expect } from 'vitest';
+import { envSchema } from './env';
+
+describe('envSchema', () => {
+  it('should allow missing MAIL_HOST in development', () => {
+    const result = envSchema.safeParse({
+      NEXT_PUBLIC_BASE_URL: 'http://localhost:3000',
+      TARGET: 'development',
+    });
+    expect(result.success).toBe(true);
+  });
+
+  it('should require MAIL_HOST in production', () => {
+    const result = envSchema.safeParse({
+      NEXT_PUBLIC_BASE_URL: 'https://example.com',
+      TARGET: 'production',
+    });
+    expect(result.success).toBe(false);
+    if (!result.success) {
+      expect(result.error.issues[0].message).toBe(
+        'MAIL_HOST is required in non-development environments',
+      );
+    }
+  });
+
+  it('should require MAIL_HOST in testing', () => {
+    const result = envSchema.safeParse({
+      NEXT_PUBLIC_BASE_URL: 'https://testing.example.com',
+      TARGET: 'testing',
+    });
+    expect(result.success).toBe(false);
+    if (!result.success) {
+      expect(result.error.issues[0].message).toBe(
+        'MAIL_HOST is required in non-development environments',
+      );
+    }
+  });
+
+  it('should require MAIL_HOST in staging', () => {
+    const result = envSchema.safeParse({
+      NEXT_PUBLIC_BASE_URL: 'https://staging.example.com',
+      TARGET: 'staging',
+    });
+    expect(result.success).toBe(false);
+    if (!result.success) {
+      expect(result.error.issues[0].message).toBe(
+        'MAIL_HOST is required in non-development environments',
+      );
+    }
+  });
+
+  it('should pass if MAIL_HOST is provided in production', () => {
+    const result = envSchema.safeParse({
+      NEXT_PUBLIC_BASE_URL: 'https://example.com',
+      TARGET: 'production',
+      MAIL_HOST: 'smtp.example.com',
+    });
+    expect(result.success).toBe(true);
+  });
+
+  it('should skip MAIL_HOST requirement if SKIP_RUNTIME_ENV_VALIDATION is true', () => {
+    process.env.SKIP_RUNTIME_ENV_VALIDATION = 'true';
+    const result = envSchema.safeParse({
+      NEXT_PUBLIC_BASE_URL: 'https://example.com',
+      TARGET: 'production',
+    });
+    expect(result.success).toBe(true);
+    delete process.env.SKIP_RUNTIME_ENV_VALIDATION;
+  });
+});
--- a/lib/env.ts
+++ b/lib/env.ts
@@ -8,37 +8,68 @@ const preprocessEmptyString = (val: unknown) => (val === '' ? undefined : val);
 /**
 * Environment variable schema.
 */
-export const envSchema = z.object({
-  NODE_ENV: z.enum(['development', 'production', 'test']).default('development'),
-  NEXT_PUBLIC_BASE_URL: z.preprocess(preprocessEmptyString, z.string().url()),
+export const envSchema = z
+  .object({
+    NODE_ENV: z.enum(['development', 'production', 'test']).default('development'),
+    NEXT_PUBLIC_BASE_URL: z.preprocess(preprocessEmptyString, z.string().url()),
+    NEXT_PUBLIC_TARGET: z.enum(['development', 'testing', 'staging', 'production']).optional(),

-  // Analytics
-  NEXT_PUBLIC_UMAMI_WEBSITE_ID: z.preprocess(preprocessEmptyString, z.string().optional()),
-  NEXT_PUBLIC_UMAMI_SCRIPT_URL: z.preprocess(preprocessEmptyString, z.string().url().default('https://analytics.infra.mintel.me/script.js')),
+    // Analytics
+    NEXT_PUBLIC_UMAMI_WEBSITE_ID: z.preprocess(preprocessEmptyString, z.string().optional()),
+    UMAMI_API_ENDPOINT: z.preprocess(
+      preprocessEmptyString,
+      z.string().url().default('https://analytics.infra.mintel.me'),
+    ),

-  // Error Tracking
-  SENTRY_DSN: z.preprocess(preprocessEmptyString, z.string().optional()),
+    // Error Tracking
+    SENTRY_DSN: z.preprocess(preprocessEmptyString, z.string().optional()),

-  // Logging
-  LOG_LEVEL: z.enum(['debug', 'info', 'warn', 'error']).default('info'),
+    // Logging
+    LOG_LEVEL: z.enum(['debug', 'info', 'warn', 'error']).default('info'),

-  // Mail
-  MAIL_HOST: z.preprocess(preprocessEmptyString, z.string().optional()),
-  MAIL_PORT: z.preprocess(preprocessEmptyString, z.coerce.number().default(587)),
-  MAIL_USERNAME: z.preprocess(preprocessEmptyString, z.string().optional()),
-  MAIL_PASSWORD: z.preprocess(preprocessEmptyString, z.string().optional()),
-  MAIL_FROM: z.preprocess(preprocessEmptyString, z.string().optional()),
-  MAIL_RECIPIENTS: z.preprocess(
-    (val) => (typeof val === 'string' ? val.split(',').filter(Boolean) : val),
-    z.array(z.string()).default([])
-  ),
+    // Mail
+    MAIL_HOST: z.preprocess(preprocessEmptyString, z.string().optional()),
+    MAIL_PORT: z.preprocess(preprocessEmptyString, z.coerce.number().default(587)),
+    MAIL_USERNAME: z.preprocess(preprocessEmptyString, z.string().optional()),
+    MAIL_PASSWORD: z.preprocess(preprocessEmptyString, z.string().optional()),
+    MAIL_FROM: z.preprocess(preprocessEmptyString, z.string().optional()),
+    MAIL_RECIPIENTS: z.preprocess(
+      (val) => (typeof val === 'string' ? val.split(',').filter(Boolean) : val),
+      z.array(z.string()).default([]),
+    ),

-  // Directus
-  DIRECTUS_URL: z.preprocess(preprocessEmptyString, z.string().url().default('http://localhost:8055')),
-  DIRECTUS_ADMIN_EMAIL: z.preprocess(preprocessEmptyString, z.string().optional()),
-  DIRECTUS_ADMIN_PASSWORD: z.preprocess(preprocessEmptyString, z.string().optional()),
-  DIRECTUS_API_TOKEN: z.preprocess(preprocessEmptyString, z.string().optional()),
-});
+    // Directus
+    DIRECTUS_URL: z.preprocess(
+      preprocessEmptyString,
+      z.string().url().default('http://localhost:8055'),
+    ),
+    DIRECTUS_ADMIN_EMAIL: z.preprocess(preprocessEmptyString, z.string().optional()),
+    DIRECTUS_ADMIN_PASSWORD: z.preprocess(preprocessEmptyString, z.string().optional()),
+    DIRECTUS_API_TOKEN: z.preprocess(preprocessEmptyString, z.string().optional()),
+    INTERNAL_DIRECTUS_URL: z.preprocess(preprocessEmptyString, z.string().url().optional()),
+
+    // Deploy Target
+    TARGET: z.enum(['development', 'testing', 'staging', 'production']).optional(),
+    // Gotify
+    GOTIFY_URL: z.preprocess(preprocessEmptyString, z.string().url().optional()),
+    GOTIFY_TOKEN: z.preprocess(preprocessEmptyString, z.string().optional()),
+  })
+  .superRefine((data, ctx) => {
+    const target = data.NEXT_PUBLIC_TARGET || data.TARGET;
+    const isDev = target === 'development' || !target;
+    const isBuildTimeValidation = process.env.SKIP_RUNTIME_ENV_VALIDATION === 'true';
+    const isServer = typeof window === 'undefined';
+
+    // Only enforce server-only variables when running on the server.
+    // In the browser, non-NEXT_PUBLIC_ variables are undefined and should not trigger validation errors.
+    if (isServer && !isDev && !isBuildTimeValidation && !data.MAIL_HOST) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'MAIL_HOST is required in non-development environments',
+        path: ['MAIL_HOST'],
+      });
+    }
+  });

 export type Env = z.infer<typeof envSchema>;

@@ -50,8 +81,13 @@ export function getRawEnv() {
  return {
    NODE_ENV: process.env.NODE_ENV,
    NEXT_PUBLIC_BASE_URL: process.env.NEXT_PUBLIC_BASE_URL,
-    NEXT_PUBLIC_UMAMI_WEBSITE_ID: process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID,
-    NEXT_PUBLIC_UMAMI_SCRIPT_URL: process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL,
+    NEXT_PUBLIC_TARGET: process.env.NEXT_PUBLIC_TARGET,
+    NEXT_PUBLIC_UMAMI_WEBSITE_ID:
+      process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID || process.env.UMAMI_WEBSITE_ID,
+    UMAMI_API_ENDPOINT:
+      process.env.UMAMI_API_ENDPOINT ||
+      process.env.UMAMI_SCRIPT_URL ||
+      process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL,
    SENTRY_DSN: process.env.SENTRY_DSN,
    LOG_LEVEL: process.env.LOG_LEVEL,
    MAIL_HOST: process.env.MAIL_HOST,
@@ -64,5 +100,9 @@ export function getRawEnv() {
    DIRECTUS_ADMIN_EMAIL: process.env.DIRECTUS_ADMIN_EMAIL,
    DIRECTUS_ADMIN_PASSWORD: process.env.DIRECTUS_ADMIN_PASSWORD,
    DIRECTUS_API_TOKEN: process.env.DIRECTUS_API_TOKEN,
+    INTERNAL_DIRECTUS_URL: process.env.INTERNAL_DIRECTUS_URL,
+    TARGET: process.env.TARGET,
+    GOTIFY_URL: process.env.GOTIFY_URL,
+    GOTIFY_TOKEN: process.env.GOTIFY_TOKEN,
  };
 }
--- a/lib/mail/mailer.test.ts
+++ b/lib/mail/mailer.test.ts
@@ -0,0 +1,59 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { sendEmail } from './mailer';
+import { config } from '../config';
+
+// Mock getServerAppServices to avoid full app initialization
+vi.mock('@/lib/services/create-services.server', () => ({
+  getServerAppServices: () => ({
+    logger: {
+      child: () => ({
+        info: vi.fn(),
+        error: vi.fn(),
+        warn: vi.fn(),
+      }),
+    },
+  }),
+}));
+
+// Mock config
+vi.mock('../config', () => ({
+  config: {
+    mail: {
+      host: 'smtp.example.com',
+      port: 587,
+      user: 'user',
+      pass: 'pass',
+      from: 'from@example.com',
+      recipients: ['to@example.com'],
+    },
+  },
+  getConfig: vi.fn(),
+}));
+
+describe('mailer', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe('sendEmail', () => {
+    it('should throw error if MAIL_HOST is missing', async () => {
+      // Temporarily nullify host
+      const originalHost = config.mail.host;
+      (config.mail as any).host = '';
+
+      const result = await sendEmail({
+        subject: 'Test',
+        html: '<p>Test</p>',
+      });
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain('MAIL_HOST is not configured');
+
+      // Restore host
+      (config.mail as any).host = originalHost;
+    });
+
+    // In a real environment, we'd mock nodemailer, but for now we focus on the validation logic
+    // we added. Full SMTP integration tests are usually out of scope for unit tests.
+  });
+});
--- a/lib/mail/mailer.ts
+++ b/lib/mail/mailer.ts
@@ -1,33 +1,44 @@
-import nodemailer from "nodemailer";
-import { render } from "@react-email/components";
-import { ReactElement } from "react";
-import { getServerAppServices } from "@/lib/services/create-services.server";
-import { config } from "../config";
+import nodemailer from 'nodemailer';
+import { getServerAppServices } from '@/lib/services/create-services.server';
+import { config } from '../config';
+import { ReactElement } from 'react';

-const transporter = nodemailer.createTransport({
-  host: config.mail.host,
-  port: config.mail.port,
-  secure: config.mail.port === 465,
-  auth: {
-    user: config.mail.user,
-    pass: config.mail.pass,
-  },
-});
+let transporterInstance: nodemailer.Transporter | null = null;
+
+function getTransporter() {
+  if (transporterInstance) return transporterInstance;
+
+  if (!config.mail.host) {
+    throw new Error('MAIL_HOST is not configured. Please check your environment variables.');
+  }
+
+  transporterInstance = nodemailer.createTransport({
+    host: config.mail.host,
+    port: config.mail.port,
+    secure: config.mail.port === 465,
+    auth: {
+      user: config.mail.user,
+      pass: config.mail.pass,
+    },
+  });
+
+  return transporterInstance;
+}

 interface SendEmailOptions {
  to?: string | string[];
+  replyTo?: string;
  subject: string;
-  template: ReactElement;
+  html: string;
 }

-export async function sendEmail({ to, subject, template }: SendEmailOptions) {
-  const html = await render(template);
-  
+export async function sendEmail({ to, replyTo, subject, html }: SendEmailOptions) {
  const recipients = to || config.mail.recipients;

  const mailOptions = {
    from: config.mail.from,
    to: recipients,
+    replyTo,
    subject,
    html,
  };
@@ -35,11 +46,12 @@ export async function sendEmail({ to, subject, template }: SendEmailOptions) {
  const logger = getServerAppServices().logger.child({ component: 'mailer' });

  try {
-    const info = await transporter.sendMail(mailOptions);
-    logger.info("Email sent successfully", { messageId: info.messageId, subject, recipients });
+    const info = await getTransporter().sendMail(mailOptions);
+    logger.info('Email sent successfully', { messageId: info.messageId, subject, recipients });
    return { success: true, messageId: info.messageId };
  } catch (error) {
-    logger.error("Error sending email", { error, subject, recipients });
-    return { success: false, error };
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    logger.error('Error sending email', { error: errorMsg, subject, recipients });
+    return { success: false, error: errorMsg };
  }
 }
--- a/lib/mdx.ts
+++ b/lib/mdx.ts
@@ -18,11 +18,61 @@ export interface ProductMdx {
  content: string;
 }

+export async function getProductMetadata(
+  slug: string,
+  locale: string,
+): Promise<Partial<ProductMdx> | null> {
+  // Map translated slug to file slug
+  const fileSlug = await mapSlugToFileSlug(slug, locale);
+  const productsDir = path.join(process.cwd(), 'data', 'products', locale);
+
+  // Try exact slug first
+  let filePath = path.join(productsDir, `${fileSlug}.mdx`);
+
+  if (!fs.existsSync(filePath)) {
+    // Try with -2 suffix (common in the dumped files)
+    filePath = path.join(productsDir, `${fileSlug}-2.mdx`);
+  }
+
+  if (!fs.existsSync(filePath)) {
+    // Fallback to English if locale is not 'en'
+    if (locale !== 'en') {
+      const enProductsDir = path.join(process.cwd(), 'data', 'products', 'en');
+      let enFilePath = path.join(enProductsDir, `${fileSlug}.mdx`);
+      if (!fs.existsSync(enFilePath)) {
+        enFilePath = path.join(enProductsDir, `${fileSlug}-2.mdx`);
+      }
+
+      if (fs.existsSync(enFilePath)) {
+        const fileContent = fs.readFileSync(enFilePath, 'utf8');
+        const { data } = matter(fileContent);
+        return {
+          slug: fileSlug,
+          frontmatter: {
+            ...data,
+            isFallback: true,
+          } as ProductFrontmatter & { isFallback?: boolean },
+        };
+      }
+    }
+  } else {
+    const fileContent = fs.readFileSync(filePath, 'utf8');
+    const { data } = matter(fileContent);
+
+    return {
+      slug: fileSlug,
+      frontmatter: data as ProductFrontmatter,
+    };
+  }
+
+  return null;
+}
+
 export async function getProductBySlug(slug: string, locale: string): Promise<ProductMdx | null> {
  // Map translated slug to file slug
  const fileSlug = await mapSlugToFileSlug(slug, locale);
  const productsDir = path.join(process.cwd(), 'data', 'products', locale);
-  
+
  // Try exact slug first
  let filePath = path.join(productsDir, `${fileSlug}.mdx`);

@@ -41,7 +91,7 @@ export async function getProductBySlug(slug: string, locale: string): Promise<Pr
      if (!fs.existsSync(enFilePath)) {
        enFilePath = path.join(enProductsDir, `${fileSlug}-2.mdx`);
      }
-      
+
      if (fs.existsSync(enFilePath)) {
        const fileContent = fs.readFileSync(enFilePath, 'utf8');
        const { data, content } = matter(fileContent);
@@ -49,7 +99,7 @@ export async function getProductBySlug(slug: string, locale: string): Promise<Pr
          slug: fileSlug,
          frontmatter: {
            ...data,
-            isFallback: true
+            isFallback: true,
          } as ProductFrontmatter & { isFallback?: boolean },
          content,
        };
@@ -67,7 +117,12 @@ export async function getProductBySlug(slug: string, locale: string): Promise<Pr
  }

  // Filter out products without images
-  if (product && (!product.frontmatter.images || product.frontmatter.images.length === 0 || !product.frontmatter.images[0])) {
+  if (
+    product &&
+    (!product.frontmatter.images ||
+      product.frontmatter.images.length === 0 ||
+      !product.frontmatter.images[0])
+  ) {
    return null;
  }

@@ -77,9 +132,9 @@ export async function getProductBySlug(slug: string, locale: string): Promise<Pr
 export async function getAllProductSlugs(locale: string): Promise<string[]> {
  const productsDir = path.join(process.cwd(), 'data', 'products', locale);
  if (!fs.existsSync(productsDir)) return [];
-  
+
  const files = fs.readdirSync(productsDir);
-  return files.filter(file => file.endsWith('.mdx')).map(file => file.replace(/\.mdx$/, ''));
+  return files.filter((file) => file.endsWith('.mdx')).map((file) => file.replace(/\.mdx$/, ''));
 }

 export async function getAllProducts(locale: string): Promise<ProductMdx[]> {
@@ -91,6 +146,19 @@ export async function getAllProducts(locale: string): Promise<ProductMdx[]> {
    allSlugs = Array.from(new Set([...slugs, ...enSlugs]));
  }

-  const products = await Promise.all(allSlugs.map(slug => getProductBySlug(slug, locale)));
+  const products = await Promise.all(allSlugs.map((slug) => getProductBySlug(slug, locale)));
  return products.filter((p): p is ProductMdx => p !== null);
 }
+
+export async function getAllProductsMetadata(locale: string): Promise<Partial<ProductMdx>[]> {
+  const slugs = await getAllProductSlugs(locale);
+  let allSlugs = slugs;
+
+  if (locale !== 'en') {
+    const enSlugs = await getAllProductSlugs('en');
+    allSlugs = Array.from(new Set([...slugs, ...enSlugs]));
+  }
+
+  const metadata = await Promise.all(allSlugs.map((slug) => getProductMetadata(slug, locale)));
+  return metadata.filter((m): m is Partial<ProductMdx> => m !== null);
+}
--- a/lib/pages.ts
+++ b/lib/pages.ts
@@ -39,23 +39,42 @@ export async function getPageBySlug(slug: string, locale: string): Promise<PageM
 export async function getAllPages(locale: string): Promise<PageMdx[]> {
  const pagesDir = path.join(process.cwd(), 'data', 'pages', locale);
  if (!fs.existsSync(pagesDir)) return [];
-  
+
  const files = fs.readdirSync(pagesDir);
  const pages = await Promise.all(
    files
-      .filter(file => file.endsWith('.mdx'))
-      .map(file => {
+      .filter((file) => file.endsWith('.mdx'))
+      .map((file) => {
        const fileSlug = file.replace(/\.mdx$/, '');
        const filePath = path.join(pagesDir, file);
-        const fileContent = { content: fs.readFileSync(filePath, 'utf8') };
-        const { data, content } = matter(fileContent.content);
+        const fileContent = fs.readFileSync(filePath, 'utf8');
+        const { data, content } = matter(fileContent);
        return {
          slug: fileSlug,
          frontmatter: data as PageFrontmatter,
          content,
        };
-      })
+      }),
  );

  return pages.filter((p): p is PageMdx => p !== null);
 }
+
+export async function getAllPagesMetadata(locale: string): Promise<Partial<PageMdx>[]> {
+  const pagesDir = path.join(process.cwd(), 'data', 'pages', locale);
+  if (!fs.existsSync(pagesDir)) return [];
+
+  const files = fs.readdirSync(pagesDir);
+  return files
+    .filter((file) => file.endsWith('.mdx'))
+    .map((file) => {
+      const fileSlug = file.replace(/\.mdx$/, '');
+      const filePath = path.join(pagesDir, file);
+      const fileContent = fs.readFileSync(filePath, 'utf8');
+      const { data } = matter(fileContent);
+      return {
+        slug: fileSlug,
+        frontmatter: data as PageFrontmatter,
+      };
+    });
+}
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -1,5 +1,6 @@
+import { config } from './config';

-export const SITE_URL = 'https://klz-cables.com';
+export const SITE_URL = config.baseUrl || 'https://klz-cables.com';
 export const LOGO_URL = `${SITE_URL}/logo.png`;

 export const getOrganizationSchema = () => ({
@@ -8,16 +9,14 @@ export const getOrganizationSchema = () => ({
  name: 'KLZ Cables',
  url: SITE_URL,
  logo: LOGO_URL,
-  sameAs: [
-    'https://www.linkedin.com/company/klz-cables',
-  ],
+  sameAs: ['https://www.linkedin.com/company/klz-cables'],
  contactPoint: {
    '@type': 'ContactPoint' as const,
    telephone: '+49-881-92537298',
    contactType: 'customer service' as const,
    email: 'info@klz-cables.com',
-    availableLanguage: ['German', 'English']
-  }
+    availableLanguage: ['German', 'English'],
+  },
 });

 export const getBreadcrumbSchema = (items: { name: string; item: string }[]) => ({
--- a/lib/services/analytics/umami-analytics-service.ts
+++ b/lib/services/analytics/umami-analytics-service.ts
@@ -1,14 +1,5 @@
 import type { AnalyticsEventProperties, AnalyticsService } from './analytics-service';
-
-/**
- * Type definition for the Umami global object.
- *
- * This represents the `window.umami` object that the Umami script exposes.
- * The `track` function can accept either an event name or a URL.
- */
-type UmamiGlobal = {
-  track?: (eventOrUrl: string, props?: AnalyticsEventProperties) => void;
-};
+import { config } from '../../config';

 /**
 * Configuration options for UmamiAnalyticsService.
@@ -20,133 +11,90 @@ export type UmamiAnalyticsServiceOptions = {
 };

 /**
- * Umami Analytics Service Implementation.
+ * Umami Analytics Service Implementation (Script-less/Proxy edition).
 *
- * This service implements the AnalyticsService interface for Umami analytics.
- * It provides type-safe event tracking and pageview tracking.
+ * This version implements the Umami tracking protocol directly via fetch,
+ * eliminating the need to load an external script.js file.
 *
- * @example
- * ```typescript
- * // Service creation (usually done by create-services.ts)
- * const service = new UmamiAnalyticsService({ enabled: true });
- *
- * // Track events
- * service.track('button_click', { button_id: 'cta' });
- * service.trackPageview('/products/123');
- * ```
- *
- * @example
- * ```typescript
- * // Using through the service layer (recommended)
- * import { getAppServices } from '@/lib/services/create-services';
- *
- * const services = getAppServices();
- * services.analytics.track('product_add_to_cart', {
- *   product_id: '123',
- *   price: 99.99,
- * });
- * ```
+ * In the browser, it gathers standard metadata (screen, language, referrer)
+ * and sends it to the proxied '/stats/api/send' endpoint.
 */
 export class UmamiAnalyticsService implements AnalyticsService {
-  constructor(private readonly options: UmamiAnalyticsServiceOptions) {}
+  private websiteId?: string;
+  private endpoint: string;
+
+  constructor(private readonly options: UmamiAnalyticsServiceOptions) {
+    this.websiteId = config.analytics.umami.websiteId;
+
+    // On server, use the full internal URL; on client, use the proxied path
+    this.endpoint = typeof window === 'undefined' ? config.analytics.umami.apiEndpoint : '/stats';
+  }

  /**
-   * Track a custom event with optional properties.
-   *
-   * This method checks if analytics are enabled and if we're in a browser environment
-   * before attempting to track the event.
-   *
-   * @param eventName - The name of the event to track
-   * @param props - Optional event properties
-   *
-   * @example
-   * ```typescript
-   * service.track('product_add_to_cart', {
-   *   product_id: '123',
-   *   product_name: 'Cable',
-   *   price: 99.99,
-   *   quantity: 1,
-   * });
-   * ```
+   * Internal method to send the payload to Umami API.
+   */
+  private async sendPayload(type: 'event', data: Record<string, any>) {
+    if (!this.options.enabled || !this.websiteId) return;
+
+    try {
+      const payload = {
+        website: this.websiteId,
+        hostname: typeof window !== 'undefined' ? window.location.hostname : 'server',
+        screen:
+          typeof window !== 'undefined'
+            ? `${window.screen.width}x${window.screen.height}`
+            : undefined,
+        language: typeof window !== 'undefined' ? navigator.language : undefined,
+        referrer: typeof window !== 'undefined' ? document.referrer : undefined,
+        ...data,
+      };
+
+      const response = await fetch(`${this.endpoint}/api/send`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'User-Agent': typeof window === 'undefined' ? 'KLZ-Server' : navigator.userAgent,
+        },
+        body: JSON.stringify({ type, payload }),
+        // Use keepalive for page navigation events to ensure they complete
+        keepalive: true,
+      } as any);
+
+      if (!response.ok && process.env.NODE_ENV === 'development') {
+        const errorText = await response.text();
+        console.warn(`[Umami] API responded with ${response.status}: ${errorText}`);
+      }
+    } catch (error) {
+      if (process.env.NODE_ENV === 'development') {
+        console.error('[Umami] Failed to send analytics:', error);
+      }
+    }
+  }
+
+  /**
+   * Track a custom event.
   */
  track(eventName: string, props?: AnalyticsEventProperties) {
-    if (!this.options.enabled) return;
-    
-    // Server-side tracking via proxy
-    if (typeof window === 'undefined') {
-      const { getServerAppServices } = require('../create-services.server');
-      const { config } = require('../../config');
-      const websiteId = config.analytics.umami.websiteId;
-      const umamiUrl = config.analytics.umami.scriptUrl.replace('/script.js', '');
-      
-      if (!websiteId) return;
-
-      const logger = getServerAppServices().logger.child({ component: 'analytics' });
-      logger.info('Sending analytics event', { eventName, props });
-
-      fetch(`${umamiUrl}/api/send`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json', 'User-Agent': 'KLZ-Server' },
-        body: JSON.stringify({ type: 'event', payload: { website: websiteId, name: eventName, data: props } }),
-      }).catch((error) => {
-        logger.error('Failed to send analytics event', { eventName, props, error });
-      });
-      return;
-    }
-
-    const umami = (window as unknown as { umami?: UmamiGlobal }).umami;
-    umami?.track?.(eventName, props);
+    this.sendPayload('event', {
+      name: eventName,
+      data: props,
+      url:
+        typeof window !== 'undefined'
+          ? window.location.pathname + window.location.search
+          : undefined,
+    });
  }

  /**
   * Track a pageview.
-   *
-   * This method checks if analytics are enabled and if we're in a browser environment
-   * before attempting to track the pageview.
-   *
-   * Umami treats `track(url)` as a pageview override, so we can use the same
-   * `track` function for both events and pageviews.
-   *
-   * @param url - The URL to track (defaults to current location)
-   *
-   * @example
-   * ```typescript
-   * // Track current page
-   * service.trackPageview();
-   *
-   * // Track custom URL
-   * service.trackPageview('/products/123?category=cables');
-   * ```
   */
  trackPageview(url?: string) {
-    if (!this.options.enabled) return;
-
-    // Server-side tracking via proxy
-    if (typeof window === 'undefined') {
-      const { getServerAppServices } = require('../create-services.server');
-      const { config } = require('../../config');
-      const websiteId = config.analytics.umami.websiteId;
-      const umamiUrl = config.analytics.umami.scriptUrl.replace('/script.js', '');
-      
-      if (!websiteId || !url) return;
-
-      const logger = getServerAppServices().logger.child({ component: 'analytics' });
-      logger.info('Sending analytics pageview', { url });
-
-      fetch(`${umamiUrl}/api/send`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json', 'User-Agent': 'KLZ-Server' },
-        body: JSON.stringify({ type: 'event', payload: { website: websiteId, url } }),
-      }).catch((error) => {
-        logger.error('Failed to send analytics pageview', { url, error });
-      });
-      return;
-    }
-
-    const umami = (window as unknown as { umami?: UmamiGlobal }).umami;
-
-    // Umami treats `track(url)` as a pageview override.
-    if (url) umami?.track?.(url);
-    else umami?.track?.(window.location.pathname + window.location.search);
+    this.sendPayload('event', {
+      url:
+        url ||
+        (typeof window !== 'undefined'
+          ? window.location.pathname + window.location.search
+          : undefined),
+    });
  }
 }
--- a/lib/services/app-services.ts
+++ b/lib/services/app-services.ts
@@ -2,6 +2,7 @@ import type { AnalyticsService } from './analytics/analytics-service';
 import type { CacheService } from './cache/cache-service';
 import type { ErrorReportingService } from './errors/error-reporting-service';
 import type { LoggerService } from './logging/logger-service';
+import type { NotificationService } from './notifications/notification-service';

 // Simple constructor-based DI container.
 export class AppServices {
@@ -9,6 +10,7 @@ export class AppServices {
    public readonly analytics: AnalyticsService,
    public readonly errors: ErrorReportingService,
    public readonly cache: CacheService,
-    public readonly logger: LoggerService
+    public readonly logger: LoggerService,
+    public readonly notifications: NotificationService,
  ) {}
 }
--- a/lib/services/create-services.server.ts
+++ b/lib/services/create-services.server.ts
@@ -4,6 +4,10 @@ import { UmamiAnalyticsService } from './analytics/umami-analytics-service';
 import { MemoryCacheService } from './cache/memory-cache-service';
 import { GlitchtipErrorReportingService } from './errors/glitchtip-error-reporting-service';
 import { NoopErrorReportingService } from './errors/noop-error-reporting-service';
+import {
+  GotifyNotificationService,
+  NoopNotificationService,
+} from './notifications/gotify-notification-service';
 import { PinoLoggerService } from './logging/pino-logger-service';
 import { config, getMaskedConfig } from '../config';

@@ -13,7 +17,7 @@ export function getServerAppServices(): AppServices {

  // Create logger first to log initialization
  const logger = new PinoLoggerService('server');
-  
+
  logger.info('Initializing server application services', {
    environment: getMaskedConfig(),
    timestamp: new Date().toISOString(),
@@ -23,6 +27,7 @@ export function getServerAppServices(): AppServices {
    umamiEnabled: config.analytics.umami.enabled,
    sentryEnabled: config.errors.glitchtip.enabled,
    mailEnabled: Boolean(config.mail.host && config.mail.user),
+    gotifyEnabled: config.notifications.gotify.enabled,
  });

  const analytics = config.analytics.umami.enabled
@@ -35,12 +40,28 @@ export function getServerAppServices(): AppServices {
    logger.info('Noop analytics service initialized (analytics disabled)');
  }

+  const notifications = config.notifications.gotify.enabled
+    ? new GotifyNotificationService({
+        url: config.notifications.gotify.url!,
+        token: config.notifications.gotify.token!,
+        enabled: true,
+      })
+    : new NoopNotificationService();
+
+  if (config.notifications.gotify.enabled) {
+    logger.info('Gotify notification service initialized');
+  } else {
+    logger.info('Noop notification service initialized (notifications disabled)');
+  }
+
  const errors = config.errors.glitchtip.enabled
-    ? new GlitchtipErrorReportingService({ enabled: true })
+    ? new GlitchtipErrorReportingService({ enabled: true }, notifications)
    : new NoopErrorReportingService();

  if (config.errors.glitchtip.enabled) {
-    logger.info('GlitchTip error reporting service initialized');
+    logger.info('GlitchTip error reporting service initialized', {
+      dsnPresent: Boolean(config.errors.glitchtip.dsn),
+    });
  } else {
    logger.info('Noop error reporting service initialized (error reporting disabled)');
  }
@@ -53,10 +74,9 @@ export function getServerAppServices(): AppServices {
    level: config.logging.level,
  });

-  singleton = new AppServices(analytics, errors, cache, logger);
-  
+  singleton = new AppServices(analytics, errors, cache, logger, notifications);
+
  logger.info('All application services initialized successfully');
-  
+
  return singleton;
 }
-
--- a/lib/services/create-services.ts
+++ b/lib/services/create-services.ts
@@ -5,6 +5,7 @@ import { GlitchtipErrorReportingService } from './errors/glitchtip-error-reporti
 import { NoopErrorReportingService } from './errors/noop-error-reporting-service';
 import { NoopLoggerService } from './logging/noop-logger-service';
 import { PinoLoggerService } from './logging/pino-logger-service';
+import { NoopNotificationService } from './notifications/gotify-notification-service';
 import { config, getMaskedConfig } from '../config';

 /**
@@ -27,7 +28,7 @@ let singleton: AppServices | undefined;
 * - Cache service (in-memory)
 *
 * The services are configured based on environment variables:
- * - `NEXT_PUBLIC_UMAMI_WEBSITE_ID` - Enables Umami analytics
+ * - `UMAMI_WEBSITE_ID` - Enables Umami analytics
 * - `NEXT_PUBLIC_SENTRY_DSN` - Enables client-side error reporting
 * - `SENTRY_DSN` - Enables server-side error reporting
 *
@@ -71,9 +72,7 @@ export function getAppServices(): AppServices {

  // Create logger first to log initialization
  const logger =
-    typeof window === 'undefined'
-      ? new PinoLoggerService('server')
-      : new NoopLoggerService();
+    typeof window === 'undefined' ? new PinoLoggerService('server') : new NoopLoggerService();

  // Log initialization
  if (typeof window === 'undefined') {
@@ -121,7 +120,9 @@ export function getAppServices(): AppServices {
    : new NoopErrorReportingService();

  if (sentryEnabled) {
-    logger.info(`GlitchTip error reporting service initialized (${typeof window === 'undefined' ? 'server' : 'client'})`);
+    logger.info(
+      `GlitchTip error reporting service initialized (${typeof window === 'undefined' ? 'server' : 'client'})`,
+    );
  } else {
    logger.info('Noop error reporting service initialized (error reporting disabled)');
  }
@@ -138,9 +139,10 @@ export function getAppServices(): AppServices {
  });

  // Create and cache the singleton
-  singleton = new AppServices(analytics, errors, cache, logger);
-  
+  const notifications = new NoopNotificationService();
+  singleton = new AppServices(analytics, errors, cache, logger, notifications);
+
  logger.info('All application services initialized successfully');
-  
+
  return singleton;
 }
--- a/lib/services/errors/error-reporting-service.ts
+++ b/lib/services/errors/error-reporting-service.ts
@@ -7,10 +7,15 @@ export type ErrorReportingUser = {
 export type ErrorReportingLevel = 'fatal' | 'error' | 'warning' | 'info' | 'debug' | 'log';

 export interface ErrorReportingService {
-  captureException(error: unknown, context?: Record<string, unknown>): string | undefined;
-  captureMessage(message: string, level?: ErrorReportingLevel): string | undefined;
+  captureException(
+    error: unknown,
+    context?: Record<string, unknown>,
+  ): Promise<string | undefined> | string | undefined;
+  captureMessage(
+    message: string,
+    level?: ErrorReportingLevel,
+  ): Promise<string | undefined> | string | undefined;
  setUser(user: ErrorReportingUser | null): void;
  setTag(key: string, value: string): void;
  withScope<T>(fn: () => T, context?: Record<string, unknown>): T;
 }
-
--- a/lib/services/errors/glitchtip-error-reporting-service.ts
+++ b/lib/services/errors/glitchtip-error-reporting-service.ts
@@ -4,6 +4,7 @@ import type {
  ErrorReportingService,
  ErrorReportingUser,
 } from './error-reporting-service';
+import type { NotificationService } from '../notifications/notification-service';

 type SentryLike = typeof Sentry;

@@ -15,12 +16,29 @@ export type GlitchtipErrorReportingServiceOptions = {
 export class GlitchtipErrorReportingService implements ErrorReportingService {
  constructor(
    private readonly options: GlitchtipErrorReportingServiceOptions,
-    private readonly sentry: SentryLike = Sentry
+    private readonly notifications?: NotificationService,
+    private readonly sentry: SentryLike = Sentry,
  ) {}

-  captureException(error: unknown, context?: Record<string, unknown>) {
+  async captureException(error: unknown, context?: Record<string, unknown>) {
    if (!this.options.enabled) return undefined;
-    return this.sentry.captureException(error, context as any) as any;
+    const result = this.sentry.captureException(error, context as any) as any;
+
+    // Send to Gotify if it's considered critical or if we just want all exceptions there
+    // For now, let's send all exceptions to Gotify as requested "notify me via gotify about critical error messages"
+    // We'll treat all captureException calls as potentially critical or at least noteworthy
+    if (this.notifications) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      const contextStr = context ? `\nContext: ${JSON.stringify(context, null, 2)}` : '';
+
+      await this.notifications.notify({
+        title: '🔥 Critical Error Captured',
+        message: `Error: ${errorMessage}${contextStr}`,
+        priority: 7,
+      });
+    }
+
+    return result;
  }

  captureMessage(message: string, level: ErrorReportingLevel = 'error') {
--- a/lib/services/errors/noop-error-reporting-service.ts
+++ b/lib/services/errors/noop-error-reporting-service.ts
@@ -1,11 +1,15 @@
-import type { ErrorReportingLevel, ErrorReportingService, ErrorReportingUser } from './error-reporting-service';
+import type {
+  ErrorReportingLevel,
+  ErrorReportingService,
+  ErrorReportingUser,
+} from './error-reporting-service';

 export class NoopErrorReportingService implements ErrorReportingService {
-  captureException(_error: unknown, _context?: Record<string, unknown>) {
+  async captureException(_error: unknown, _context?: Record<string, unknown>) {
    return undefined;
  }

-  captureMessage(_message: string, _level?: ErrorReportingLevel) {
+  async captureMessage(_message: string, _level?: ErrorReportingLevel) {
    return undefined;
  }

--- a/lib/services/logging/pino-logger-service.ts
+++ b/lib/services/logging/pino-logger-service.ts
@@ -12,20 +12,19 @@ export class PinoLoggerService implements LoggerService {
      // In Next.js, especially in the Edge runtime or during instrumentation,
      // pino transports (which use worker threads) can cause issues.
      // We disable transport in production and during instrumentation.
-      const useTransport = !config.isProduction && typeof window === 'undefined';
+      const useTransport = config.isDevelopment && typeof window === 'undefined';

      this.logger = pino({
        name: name || 'app',
        level: config.logging.level,
-        transport:
-          useTransport
-            ? {
-                target: 'pino-pretty',
-                options: {
-                  colorize: true,
-                },
-              }
-            : undefined,
+        transport: useTransport
+          ? {
+              target: 'pino-pretty',
+              options: {
+                colorize: true,
+              },
+            }
+          : undefined,
      });
    }
  }
--- a/lib/services/notifications/gotify-notification-service.ts
+++ b/lib/services/notifications/gotify-notification-service.ts
@@ -0,0 +1,49 @@
+import { NotificationOptions, NotificationService } from './notification-service';
+
+export interface GotifyConfig {
+  url: string;
+  token: string;
+  enabled: boolean;
+}
+
+export class GotifyNotificationService implements NotificationService {
+  constructor(private config: GotifyConfig) {}
+
+  async notify(options: NotificationOptions): Promise<void> {
+    if (!this.config.enabled) return;
+
+    try {
+      const { title, message, priority = 4 } = options;
+      const url = new URL('message', this.config.url);
+      url.searchParams.set('token', this.config.token);
+
+      const response = await fetch(url.toString(), {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          title,
+          message,
+          priority,
+        }),
+      });
+
+      if (!response.ok) {
+        const errorText = await response.text();
+        console.error('Gotify notification failed:', {
+          status: response.status,
+          error: errorText,
+        });
+      }
+    } catch (error) {
+      console.error('Gotify notification error:', error);
+    }
+  }
+}
+
+export class NoopNotificationService implements NotificationService {
+  async notify(): Promise<void> {
+    // Do nothing
+  }
+}
--- a/lib/services/notifications/notification-service.ts
+++ b/lib/services/notifications/notification-service.ts
@@ -0,0 +1,9 @@
+export interface NotificationOptions {
+  title: string;
+  message: string;
+  priority?: number;
+}
+
+export interface NotificationService {
+  notify(options: NotificationOptions): Promise<void>;
+}
--- a/lighthouserc.js
+++ b/lighthouserc.js
@@ -0,0 +1,19 @@
+module.exports = {
+  ci: {
+    collect: {
+      numberOfRuns: 1,
+      settings: {
+        preset: 'desktop',
+        onlyCategories: ['performance', 'accessibility', 'best-practices', 'seo'],
+      },
+    },
+    assert: {
+      assertions: {
+        'categories:performance': ['warn', { minScore: 0.9 }],
+        'categories:accessibility': ['warn', { minScore: 0.9 }],
+        'categories:best-practices': ['warn', { minScore: 0.9 }],
+        'categories:seo': ['warn', { minScore: 0.9 }],
+      },
+    },
+  },
+};
--- a/messages/de.json
+++ b/messages/de.json
@@ -191,7 +191,14 @@
      "emailPlaceholder": "ihre@email.de",
      "message": "Nachricht",
      "messagePlaceholder": "Wie können wir Ihnen helfen?",
-      "submit": "Nachricht senden"
+      "submit": "Nachricht senden",
+      "submitting": "Wird gesendet...",
+      "successTitle": "Nachricht gesendet!",
+      "successDesc": "Vielen Dank für Ihre Nachricht. Wir werden uns so schnell wie möglich bei Ihnen melden.",
+      "sendAnother": "Weitere Nachricht senden",
+      "errorTitle": "Senden fehlgeschlagen!",
+      "error": "Etwas ist schief gelaufen. Bitte überprüfen Sie Ihre Eingaben und versuchen Sie es erneut.",
+      "tryAgain": "Erneut versuchen"
    }
  },
  "Products": {
--- a/messages/en.json
+++ b/messages/en.json
@@ -191,7 +191,14 @@
      "emailPlaceholder": "your@email.com",
      "message": "Message",
      "messagePlaceholder": "How can we help you?",
-      "submit": "Send Message"
+      "submit": "Send Message",
+      "submitting": "Sending...",
+      "successTitle": "Message Sent!",
+      "successDesc": "Thank you for your message. We will get back to you as soon as possible.",
+      "sendAnother": "Send another message",
+      "errorTitle": "Submission Failed!",
+      "error": "Something went wrong. Please check your input and try again.",
+      "tryAgain": "Try Again"
    }
  },
  "Products": {
--- a/middleware.ts
+++ b/middleware.ts
@@ -1,6 +1,5 @@
 import createMiddleware from 'next-intl/middleware';
-import { NextResponse } from 'next/server';
-import type { NextRequest } from 'next/server';
+import { NextResponse, NextRequest } from 'next/server';

 // Create the internationalization middleware
 const intlMiddleware = createMiddleware({
@@ -8,31 +7,60 @@ const intlMiddleware = createMiddleware({
  locales: ['en', 'de'],

  // Used when no locale matches
-  defaultLocale: 'en'
+  defaultLocale: 'en',
 });

-// Main middleware that logs all requests
 export default function middleware(request: NextRequest) {
-  const startTime = Date.now();
  const { method, url, headers } = request;
-  const userAgent = headers.get('user-agent') || 'unknown';
-  const referer = headers.get('referer') || 'none';
-  const ip = headers.get('x-forwarded-for') || headers.get('x-real-ip') || 'unknown';

-  // Log incoming request
-  console.log(`Incoming request: method=${method} url=${url}`);
+  // Build header object for logging
+  const headerObj: Record<string, string> = {};
+  headers.forEach((value, key) => {
+    headerObj[key] = value;
+  });
+
+  // Defensive URL correction for internal container leakage (0.0.0.0, klz-app, localhost)
+  // This prevents hydration mismatches and host poisoning in generated links/metadata.
+  const urlObj = new URL(url);
+  const internalHosts = ['0.0.0.0', 'klz-app', 'localhost', '127.0.0.1'];
+
+  let effectiveRequest = request;
+  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 [publicHostname] = hostHeader.split(':');
+
+    urlObj.protocol = proto;
+    urlObj.hostname = publicHostname;
+    urlObj.port = ''; // Explicitly clear internal port (3000)
+
+    effectiveRequest = new NextRequest(urlObj, {
+      headers: request.headers,
+      method: request.method,
+      body: request.body,
+    });
+
+    console.log(
+      `🛡️ Middleware: Fixed internal URL leak: ${url} -> ${urlObj.toString()} | Proto: ${proto} | Host: ${hostHeader}`,
+    );
+  }

  try {
    // Apply internationalization middleware
-    const response = intlMiddleware(request);
+    const response = intlMiddleware(effectiveRequest);
    return response;
  } catch (error) {
-    console.error(`Request failed: method=${method} url=${url}`, error);
+    console.error(
+      `Request failed: method=${method} url=${url} headers=${JSON.stringify(headerObj)}`,
+      error,
+    );
    throw error;
  }
 }

 export const config = {
  // Match only internationalized pathnames
-  matcher: ['/((?!api|_next|_vercel|health|.*\\..*).*)', '/', '/(de|en)/:path*']
+  matcher: ['/((?!api|_next|_vercel|stats|errors|health|.*\\..*).*)', '/', '/(de|en)/:path*'],
 };
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -322,12 +322,12 @@ const nextConfig = {
    contentSecurityPolicy: "default-src 'self'; script-src 'none'; sandbox;",
  },
  async rewrites() {
-    const umamiUrl = (process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL || 'https://analytics.infra.mintel.me').replace('/script.js', '');
+    const umamiUrl = (process.env.UMAMI_API_ENDPOINT || process.env.UMAMI_SCRIPT_URL || process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL || 'https://analytics.infra.mintel.me');
    const glitchtipUrl = process.env.SENTRY_DSN
      ? new URL(process.env.SENTRY_DSN).origin
      : 'https://errors.infra.mintel.me';

-    const directusUrl = process.env.DIRECTUS_URL || 'https://cms.klz-cables.com';
+    const directusUrl = process.env.INTERNAL_DIRECTUS_URL || process.env.DIRECTUS_URL || 'https://cms.klz-cables.com';

    return [
      {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
  "dependencies": {
    "@directus/sdk": "^18.0.3",
+    "@mintel/mail": "^1.2.3",
    "@react-email/components": "^1.0.6",
    "@react-pdf/renderer": "^4.3.2",
    "@sentry/nextjs": "^8.55.0",
@@ -37,6 +38,9 @@
    "zod": "^4.3.6"
  },
  "devDependencies": {
+    "@commitlint/cli": "^20.4.0",
+    "@commitlint/config-conventional": "^20.4.0",
+    "@lhci/cli": "^0.15.1",
    "@tailwindcss/cli": "^4.1.18",
    "@tailwindcss/postcss": "^4.1.18",
    "@types/node": "^22.19.3",
@@ -48,7 +52,11 @@
    "autoprefixer": "^10.4.23",
    "eslint": "^8.57.1",
    "eslint-config-next": "14.2.35",
+    "eslint-config-prettier": "^10.1.8",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.2.7",
    "postcss": "^8.5.6",
+    "prettier": "^3.8.1",
    "sass": "^1.97.1",
    "tailwindcss": "^4.1.18",
    "tsx": "^4.21.0",
@@ -58,7 +66,7 @@
  "name": "klz-cables-nextjs",
  "private": true,
  "scripts": {
-    "dev": "docker network create infra 2>/dev/null || true && echo '\\n🚀 Development Environment Starting...\\n\\n📱 App:      http://klz.localhost\\n🗄️  CMS:      http://cms.klz.localhost/admin\\n🚦 Traefik:  http://localhost:8080\\n\\n(Press Ctrl+C to stop)\\n' && docker-compose down --remove-orphans && docker-compose up",
+    "dev": "docker network create infra 2>/dev/null || true && echo '\\n🚀 Development Environment Starting...\\n\\n📱 App:      http://klz.localhost\\n🗄️  CMS:      http://cms.klz.localhost/admin\\n🚦 Traefik:  http://localhost:8080\\n\\n(Press Ctrl+C to stop)\\n' && docker-compose down --remove-orphans && docker-compose up klz-app directus directus-db",
    "dev:local": "next dev",
    "build": "next build",
    "start": "next start",
@@ -66,9 +74,22 @@
    "typecheck": "tsc --noEmit",
    "test": "vitest run --passWithNoTests",
    "test:og": "vitest run tests/og-image.test.ts",
-    "bootstrap:cms": "DIRECTUS_URL=http://localhost:8055 npx tsx --env-file=.env scripts/setup-directus-branding.ts",
+    "cms:branding:local": "DIRECTUS_URL=http://localhost:8055 npx tsx --env-file=.env scripts/setup-directus-branding.ts",
+    "cms:branding:testing": "DIRECTUS_URL=https://cms.testing.klz-cables.com npx tsx --env-file=.env scripts/setup-directus-branding.ts",
+    "cms:branding:staging": "DIRECTUS_URL=https://cms.staging.klz-cables.com npx tsx --env-file=.env scripts/setup-directus-branding.ts",
+    "cms:branding:prod": "DIRECTUS_URL=https://cms.klz-cables.com npx tsx --env-file=.env scripts/setup-directus-branding.ts",
+    "cms:bootstrap": "npm run cms:branding:local",
    "pdf:datasheets": "tsx ./scripts/generate-pdf-datasheets.ts",
-    "pdf:datasheets:legacy": "tsx ./scripts/generate-pdf-datasheets-pdf-lib.ts"
+    "pdf:datasheets:legacy": "tsx ./scripts/generate-pdf-datasheets-pdf-lib.ts",
+    "cms:push:staging": "./scripts/sync-directus.sh push staging",
+    "cms:pull:staging": "./scripts/sync-directus.sh pull staging",
+    "cms:push:testing": "./scripts/sync-directus.sh push testing",
+    "cms:pull:testing": "./scripts/sync-directus.sh pull testing",
+    "cms:push:prod": "./scripts/sync-directus.sh push production",
+    "cms:pull:prod": "./scripts/sync-directus.sh pull production",
+    "pagespeed:test": "tsx ./scripts/pagespeed-sitemap.ts",
+    "pagespeed:urls": "tsx -e \"import sitemap from './app/sitemap'; sitemap().then(urls => console.log(urls.map(u => u.url).join('\\n')))\"",
+    "prepare": "husky"
  },
  "version": "1.0.0"
-}
+}
--- a/public/datasheets/medium-voltage/na2xsf2y-de.pdf
+++ b/public/datasheets/medium-voltage/na2xsf2y-de.pdf
--- a/public/datasheets/medium-voltage/na2xsf2y-en.pdf
+++ b/public/datasheets/medium-voltage/na2xsf2y-en.pdf
--- a/public/logo.png
+++ b/public/logo.png
--- a/scripts/pagespeed-sitemap.ts
+++ b/scripts/pagespeed-sitemap.ts
@@ -0,0 +1,159 @@
+import axios from 'axios';
+import * as cheerio from 'cheerio';
+import { execSync } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+
+/**
+ * PageSpeed Test Script
+ *
+ * 1. Fetches sitemap.xml from the target URL
+ * 2. Extracts all URLs
+ * 3. Runs Lighthouse CI on those URLs
+ */
+
+const targetUrl =
+  process.argv[2] || process.env.NEXT_PUBLIC_BASE_URL || 'https://testing.klz-cables.com';
+const limit = process.env.PAGESPEED_LIMIT ? parseInt(process.env.PAGESPEED_LIMIT) : 20; // Default limit to avoid infinite runs
+const gatekeeperPassword = process.env.GATEKEEPER_PASSWORD || 'klz2026';
+
+async function main() {
+  console.log(`\n🚀 Starting PageSpeed test for: ${targetUrl}`);
+  console.log(`📊 Limit: ${limit} pages\n`);
+
+  try {
+    // 1. Fetch Sitemap
+    const sitemapUrl = `${targetUrl.replace(/\/$/, '')}/sitemap.xml`;
+    console.log(`📥 Fetching sitemap from ${sitemapUrl}...`);
+
+    // We might need to bypass gatekeeper for the sitemap fetch too
+    const response = await axios.get(sitemapUrl, {
+      headers: {
+        Cookie: `klz_gatekeeper_session=${gatekeeperPassword}`,
+      },
+      validateStatus: (status) => status < 400,
+    });
+
+    const $ = cheerio.load(response.data, { xmlMode: true });
+    let urls = $('url loc')
+      .map((i, el) => $(el).text())
+      .get();
+
+    // Cleanup, filter and normalize domains to targetUrl
+    const urlPattern = /https?:\/\/[^\/]+/;
+    urls = [...new Set(urls)]
+      .filter((u) => u.startsWith('http'))
+      .map((u) => u.replace(urlPattern, targetUrl.replace(/\/$/, '')))
+      .sort();
+
+    console.log(`✅ Found ${urls.length} URLs in sitemap.`);
+
+    if (urls.length === 0) {
+      console.error('❌ No URLs found in sitemap. Is the site up?');
+      process.exit(1);
+    }
+
+    if (urls.length > limit) {
+      console.log(
+        `⚠️  Too many pages (${urls.length}). Limiting to ${limit} representative pages.`,
+      );
+      // Try to pick a variety: home, some products, some blog posts
+      const home = urls.filter((u) => u.endsWith('/de') || u.endsWith('/en') || u === targetUrl);
+      const others = urls.filter((u) => !home.includes(u));
+      urls = [...home, ...others.slice(0, limit - home.length)];
+    }
+
+    console.log(`🧪 Pages to be tested:`);
+    urls.forEach((u) => console.log(`   - ${u}`));
+
+    // 2. Prepare LHCI command
+    // We use --collect.url multiple times
+    const urlArgs = urls.map((u) => `--collect.url="${u}"`).join(' ');
+
+    // Handle authentication for staging/testing
+    // Lighthouse can set cookies via --collect.settings.extraHeaders
+    const extraHeaders = JSON.stringify({
+      Cookie: `klz_gatekeeper_session=${gatekeeperPassword}`,
+    });
+
+    const chromePath = process.env.CHROME_PATH || process.env.PUPPETEER_EXECUTABLE_PATH;
+    const chromePathArg = chromePath ? `--collect.chromePath="${chromePath}"` : '';
+
+    // Clean up old reports
+    if (fs.existsSync('.lighthouseci')) {
+      fs.rmSync('.lighthouseci', { recursive: true, force: true });
+    }
+
+    // Using a more robust way to execute and capture output
+    // We remove 'npx lhci upload' to keep everything local and avoid Google-hosted reports
+    const lhciCommand = `npx lhci collect ${urlArgs} ${chromePathArg} --collect.settings.chromeFlags='--no-sandbox --disable-setuid-sandbox' --collect.settings.extraHeaders='${extraHeaders}' && npx lhci assert`;
+
+    console.log(`💻 Executing LHCI...`);
+
+    try {
+      execSync(lhciCommand, {
+        encoding: 'utf8',
+        stdio: 'inherit',
+      });
+    } catch (err: any) {
+      console.warn('⚠️ LHCI assertion finished with warnings or errors.');
+      // We continue to show the table even if assertions failed
+    }
+
+    // 3. Summarize Results (Local & Independent)
+    const manifestPath = path.join(process.cwd(), '.lighthouseci', 'manifest.json');
+    if (fs.existsSync(manifestPath)) {
+      const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+      console.log(`\n📊 PageSpeed Summary (FOSS - Local Report):\n`);
+
+      const summaryTable = manifest.map((entry: any) => {
+        const s = entry.summary;
+        return {
+          URL: entry.url.replace(targetUrl, ''),
+          Perf: Math.round(s.performance * 100),
+          Acc: Math.round(s.accessibility * 100),
+          BP: Math.round(s['best-practices'] * 100),
+          SEO: Math.round(s.seo * 100),
+        };
+      });
+
+      console.table(summaryTable);
+
+      // Calculate Average
+      const avg = {
+        Perf: Math.round(
+          summaryTable.reduce((acc: any, curr: any) => acc + curr.Perf, 0) / summaryTable.length,
+        ),
+        Acc: Math.round(
+          summaryTable.reduce((acc: any, curr: any) => acc + curr.Acc, 0) / summaryTable.length,
+        ),
+        BP: Math.round(
+          summaryTable.reduce((acc: any, curr: any) => acc + curr.BP, 0) / summaryTable.length,
+        ),
+        SEO: Math.round(
+          summaryTable.reduce((acc: any, curr: any) => acc + curr.SEO, 0) / summaryTable.length,
+        ),
+      };
+
+      console.log(`\n📈 Average Scores:`);
+      console.log(`   Performance:   ${avg.Perf > 90 ? '✅' : '⚠️'} ${avg.Perf}`);
+      console.log(`   Accessibility: ${avg.Acc > 90 ? '✅' : '⚠️'} ${avg.Acc}`);
+      console.log(`   Best Practices: ${avg.BP > 90 ? '✅' : '⚠️'} ${avg.BP}`);
+      console.log(`   SEO:           ${avg.SEO > 90 ? '✅' : '⚠️'} ${avg.SEO}`);
+    }
+
+    console.log(`\n✨ PageSpeed tests completed successfully!`);
+  } catch (error: any) {
+    console.error(`\n❌ Error during PageSpeed test:`);
+    if (axios.isAxiosError(error)) {
+      console.error(`Status: ${error.response?.status}`);
+      console.error(`StatusText: ${error.response?.statusText}`);
+      console.error(`URL: ${error.config?.url}`);
+    } else {
+      console.error(error.message);
+    }
+    process.exit(1);
+  }
+}
+
+main();
--- a/scripts/setup-directus-branding.ts
+++ b/scripts/setup-directus-branding.ts
@@ -9,49 +9,65 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);

 async function setupBranding() {
-    console.log('🎨 Refining Directus Branding for Premium Website Look...');
+  console.log('🎨 Refining Directus Branding for Premium Website Look...');

-    // 1. Authenticate
-    await ensureAuthenticated();
+  // 1. Authenticate
+  await ensureAuthenticated();

-    try {
-        // 2. Upload Assets (MIME FIXED)
-        console.log('📤 Re-uploading assets for clean IDs...');
+  try {
+    // 2. Upload Assets (MIME FIXED)
+    console.log('📤 Re-uploading assets for clean IDs...');

-        const getMimeType = (filePath: string) => {
-            const ext = path.extname(filePath).toLowerCase();
-            switch (ext) {
-                case '.svg': return 'image/svg+xml';
-                case '.png': return 'image/png';
-                case '.jpg':
-                case '.jpeg': return 'image/jpeg';
-                case '.ico': return 'image/x-icon';
-                default: return 'application/octet-stream';
-            }
-        };
+    const getMimeType = (filePath: string) => {
+      const ext = path.extname(filePath).toLowerCase();
+      switch (ext) {
+        case '.svg':
+          return 'image/svg+xml';
+        case '.png':
+          return 'image/png';
+        case '.jpg':
+        case '.jpeg':
+          return 'image/jpeg';
+        case '.ico':
+          return 'image/x-icon';
+        default:
+          return 'application/octet-stream';
+      }
+    };

-        const uploadAsset = async (filePath: string, title: string) => {
-            if (!fs.existsSync(filePath)) {
-                console.warn(`⚠️ File not found: ${filePath}`);
-                return null;
-            }
-            const mimeType = getMimeType(filePath);
-            const form = new FormData();
-            const fileBuffer = fs.readFileSync(filePath);
-            const blob = new Blob([fileBuffer], { type: mimeType });
-            form.append('file', blob, path.basename(filePath));
-            form.append('title', title);
-            const res = await client.request(uploadFiles(form));
-            return res.id;
-        };
+    const uploadAsset = async (filePath: string, title: string) => {
+      if (!fs.existsSync(filePath)) {
+        console.warn(`⚠️ File not found: ${filePath}`);
+        return null;
+      }
+      const mimeType = getMimeType(filePath);
+      const form = new FormData();
+      const fileBuffer = fs.readFileSync(filePath);
+      const blob = new Blob([fileBuffer], { type: mimeType });
+      form.append('file', blob, path.basename(filePath));
+      form.append('title', title);
+      const res = await client.request(uploadFiles(form));
+      return res.id;
+    };

-        const logoWhiteId = await uploadAsset(path.resolve(__dirname, '../public/logo-white.svg'), 'Logo White');
-        const logoBlueId = await uploadAsset(path.resolve(__dirname, '../public/logo-blue.svg'), 'Logo Blue');
-        const faviconId = await uploadAsset(path.resolve(__dirname, '../public/favicon.ico'), 'Favicon');
+    const logoWhiteId = await uploadAsset(
+      path.resolve(__dirname, '../public/logo-white.svg'),
+      'Logo White',
+    );
+    const logoBlueId = await uploadAsset(
+      path.resolve(__dirname, '../public/logo-blue.svg'),
+      'Logo Blue',
+    );
+    const faviconId = await uploadAsset(
+      path.resolve(__dirname, '../public/favicon.ico'),
+      'Favicon',
+    );

-        // Smoother Background SVG
-        const bgSvgPath = path.resolve(__dirname, '../public/login-bg.svg');
-        fs.writeFileSync(bgSvgPath, `<svg width="1920" height="1080" viewBox="0 0 1920 1080" fill="none" xmlns="http://www.w3.org/2000/svg">
+    // Smoother Background SVG
+    const bgSvgPath = path.resolve(__dirname, '../public/login-bg.svg');
+    fs.writeFileSync(
+      bgSvgPath,
+      `<svg width="1920" height="1080" viewBox="0 0 1920 1080" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect width="1920" height="1080" fill="#001a4d"/>
 <ellipse cx="960" cy="540" rx="800" ry="600" fill="url(#paint0_radial_premium)"/>
 <defs>
@@ -60,122 +76,142 @@ async function setupBranding() {
 <stop offset="1" stop-color="#001a4d" stop-opacity="0"/>
 </radialGradient>
 </defs>
-</svg>`);
-        const backgroundId = await uploadAsset(bgSvgPath, 'Login Bg');
-        if (fs.existsSync(bgSvgPath)) fs.unlinkSync(bgSvgPath);
+</svg>`,
+    );
+    const backgroundId = await uploadAsset(bgSvgPath, 'Login Bg');
+    if (fs.existsSync(bgSvgPath)) fs.unlinkSync(bgSvgPath);

-        // 3. Update Settings with "Premium Web" Theme
-        console.log('⚙️  Updating Directus settings...');
+    // 3. Update Settings with "Premium Web" Theme
+    console.log('⚙️  Updating Directus settings...');

-        const COLOR_PRIMARY = '#001a4d'; // Deep Blue
-        const COLOR_ACCENT = '#82ed20'; // Sustainability Green
-        const COLOR_SECONDARY = '#003d82';
+    const COLOR_PRIMARY = '#001a4d'; // Deep Blue
+    const COLOR_ACCENT = '#82ed20'; // Sustainability Green
+    const COLOR_SECONDARY = '#003d82';

-        const cssInjection = `
-        <style>
-            @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
-            
-            /* Global Login Styles */
-            body, .v-app { 
-                font-family: 'Inter', sans-serif !important; 
-                -webkit-font-smoothing: antialiased;
-            }
-            
-            /* Glassmorphism Effect for Login Card */
-            .public-view .v-card { 
-                background: rgba(255, 255, 255, 0.95) !important;
-                backdrop-filter: blur(20px);
-                border: 1px solid rgba(255, 255, 255, 0.3) !important;
-                border-radius: 32px !important; 
-                box-shadow: 0 50px 100px -20px rgba(0, 0, 0, 0.4) !important;
-                padding: 40px !important;
-            }
+    const customCss = `
+        @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
+        
+        /* Global Login Styles */
+        body, .v-app { 
+            font-family: 'Inter', sans-serif !important; 
+            -webkit-font-smoothing: antialiased;
+        }
+        
+        /* Glassmorphism Effect for Login Card */
+        .public-view .v-card { 
+            background: rgba(255, 255, 255, 0.95) !important;
+            backdrop-filter: blur(20px);
+            border: 1px solid rgba(255, 255, 255, 0.3) !important;
+            border-radius: 32px !important; 
+            box-shadow: 0 50px 100px -20px rgba(0, 0, 0, 0.4) !important;
+            padding: 40px !important;
+        }

-            .public-view .v-button {
-                border-radius: full !important;
-                height: 56px !important;
-                font-weight: 600 !important;
-                letter-spacing: -0.01em !important;
-                transition: all 0.4s cubic-bezier(0.16, 1, 0.3, 1) !important;
-            }
+        .public-view .v-button {
+            border-radius: 9999px !important;
+            height: 56px !important;
+            font-weight: 600 !important;
+            letter-spacing: -0.01em !important;
+            transition: all 0.4s cubic-bezier(0.16, 1, 0.3, 1) !important;
+        }

-            .public-view .v-button:hover {
-                transform: translateY(-2px);
-                box-shadow: 0 15px 30px rgba(130, 237, 32, 0.2) !important;
-            }
+        .public-view .v-button:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 15px 30px rgba(130, 237, 32, 0.2) !important;
+        }

-            .public-view .v-input {
-                --v-input-border-radius: 12px !important;
-                --v-input-background-color: #f8f9fa !important;
-            }
-        </style>
-        <div style="font-family: 'Inter', sans-serif; text-align: center; margin-top: 24px;">
-            <p style="color: rgba(255,255,255,0.7); font-size: 14px; margin-bottom: 4px; font-weight: 500;">KLZ INFRASTRUCTURE ENGINE</p>
-            <h1 style="color: #ffffff; font-size: 18px; font-weight: 700; margin: 0;">Sustainable Energy. <span style="color: #82ed20;">Industrial Reliability.</span></h1>
-        </div>
+        .public-view .v-input {
+            --v-input-border-radius: 12px !important;
+            --v-input-background-color: #f8f9fa !important;
+        }
+
+        /* Inject Headline via CSS to avoid raw HTML display in public_note */
+        .public-view .form::before {
+            content: 'Sustainable Energy. Industrial Reliability.';
+            display: block;
+            text-align: center;
+            font-size: 18px;
+            font-weight: 700;
+            color: #ffffff;
+            margin-bottom: 8px;
+        }
+
+        .public-view .form::after {
+            content: 'KLZ INFRASTRUCTURE ENGINE';
+            display: block;
+            text-align: center;
+            font-size: 11px;
+            font-weight: 600;
+            letter-spacing: 0.1em;
+            color: rgba(255, 255, 255, 0.5);
+            margin-top: 24px;
+        }
        `;

-        await client.request(updateSettings({
-            project_name: 'KLZ Cables',
-            project_url: 'https://klz-cables.com',
-            project_color: COLOR_ACCENT,
-            project_descriptor: 'Sustainable Energy Infrastructure',
-            project_owner: 'KLZ Cables',
+    const publicNote = '';

-            // FIXED: Use WHITE logo for the Blue Sidebar
-            project_logo: logoWhiteId as any,
+    await client.request(
+      updateSettings({
+        project_name: 'KLZ Cables',
+        project_url: 'https://klz-cables.com',
+        project_color: COLOR_ACCENT,
+        project_descriptor: 'Sustainable Energy Infrastructure',

-            public_foreground: logoWhiteId as any,
-            public_background: backgroundId as any,
-            public_note: cssInjection,
-            public_favicon: faviconId as any,
+        // FIXED: Use WHITE logo for the Blue Sidebar
+        project_logo: logoWhiteId as any,

-            // DEEP PREMIUM THEME
-            theme_light_overrides: {
-                // Brands
-                "primary": COLOR_ACCENT, // Buttons/Actions are GREEN like the website
-                "secondary": COLOR_SECONDARY,
+        public_foreground: logoWhiteId as any,
+        public_background: backgroundId as any,
+        public_note: publicNote,
+        public_favicon: faviconId as any,
+        custom_css: customCss,

-                // Content Area
-                "background": "#f1f3f7",
-                "backgroundNormal": "#ffffff",
-                "backgroundAccent": "#eef2ff",
+        // DEEP PREMIUM THEME
+        theme_light_overrides: {
+          // Brands
+          primary: COLOR_ACCENT, // Buttons/Actions are GREEN like the website
+          secondary: COLOR_SECONDARY,

-                // Sidebar Branding
-                "navigationBackground": COLOR_PRIMARY,
-                "navigationForeground": "#ffffff",
-                "navigationBackgroundHover": "rgba(255,255,255,0.05)",
-                "navigationForegroundHover": "#ffffff",
-                "navigationBackgroundActive": "rgba(130, 237, 32, 0.15)", // Subtle Green highlight
-                "navigationForegroundActive": COLOR_ACCENT, // Active item is GREEN
+          // Content Area
+          background: '#f1f3f7',
+          backgroundNormal: '#ffffff',
+          backgroundAccent: '#eef2ff',

-                // Module Bar (Thin far left)
-                "moduleBarBackground": "#000d26",
-                "moduleBarForeground": "#ffffff",
-                "moduleBarForegroundActive": COLOR_ACCENT,
+          // Sidebar Branding
+          navigationBackground: COLOR_PRIMARY,
+          navigationForeground: '#ffffff',
+          navigationBackgroundHover: 'rgba(255,255,255,0.05)',
+          navigationForegroundHover: '#ffffff',
+          navigationBackgroundActive: 'rgba(130, 237, 32, 0.15)', // Subtle Green highlight
+          navigationForegroundActive: COLOR_ACCENT, // Active item is GREEN

-                // UI Standards
-                "borderRadius": "16px", // Larger radius for modern feel
-                "borderWidth": "1px",
-                "borderColor": "#e2e8f0",
-                "formFieldHeight": "48px" // Touch-target height
-            } as any,
+          // Module Bar (Thin far left)
+          moduleBarBackground: '#000d26',
+          moduleBarForeground: '#ffffff',
+          moduleBarForegroundActive: COLOR_ACCENT,

-            theme_dark_overrides: {
-                "primary": COLOR_ACCENT,
-                "background": "#0a0a0a",
-                "navigationBackground": "#000000",
-                "moduleBarBackground": COLOR_PRIMARY,
-                "borderRadius": "16px",
-                "formFieldHeight": "48px"
-            } as any
-        }));
+          // UI Standards
+          borderRadius: '16px', // Larger radius for modern feel
+          borderWidth: '1px',
+          borderColor: '#e2e8f0',
+          formFieldHeight: '48px', // Touch-target height
+        } as any,

-        console.log('✨ Premium Theme applied successfully!');
+        theme_dark_overrides: {
+          primary: COLOR_ACCENT,
+          background: '#0a0a0a',
+          navigationBackground: '#000000',
+          moduleBarBackground: COLOR_PRIMARY,
+          borderRadius: '16px',
+          formFieldHeight: '48px',
+        } as any,
+      }),
+    );

-    } catch (error: any) {
-        console.error('❌ Error:', JSON.stringify(error, null, 2));
-    }
+    console.log('✨ Premium Theme applied successfully!');
+  } catch (error: any) {
+    console.error('❌ Error:', JSON.stringify(error, null, 2));
+  }
 }

 setupBranding();
--- a/scripts/sync-directus.sh
+++ b/scripts/sync-directus.sh
@@ -0,0 +1,146 @@
+#!/bin/bash
+
+# Configuration
+REMOTE_HOST="root@alpha.mintel.me"
+REMOTE_DIR="/home/deploy/sites/klz-cables.com"
+
+# DB Details (matching docker-compose defaults)
+DB_USER="directus"
+DB_NAME="directus"
+
+ACTION=$1
+ENV=$2
+
+# Help
+if [ -z "$ACTION" ] || [ -z "$ENV" ]; then
+    echo "Usage: ./scripts/sync-directus.sh [push|pull] [testing|staging|production]"
+    echo ""
+    echo "Commands:"
+    echo "  push   Sync LOCAL data -> REMOTE"
+    echo "  pull   Sync REMOTE data -> LOCAL"
+    echo ""
+    echo "Environments:"
+    echo "  testing, staging, production"
+    exit 1
+fi
+
+# Map Environment to Project Name
+case $ENV in
+  testing)
+    PROJECT_NAME="klz-cables-testing"
+    ENV_FILE=".env.testing"
+    ;;
+  staging)
+    PROJECT_NAME="klz-cables-staging"
+    ENV_FILE=".env.staging"
+    ;;
+  production)
+    PROJECT_NAME="klz-cables-prod"
+    # Fallback to older project name if prod-specific one isn't found later in the script
+    OLD_PROJECT_NAME="klz-cablescom"
+    ENV_FILE=".env.prod"
+    ;;
+  *)
+    echo "❌ Invalid environment: $ENV. Use testing, staging, or production."
+    exit 1
+    ;;
+esac
+
+# Detect local container
+echo "🔍 Detecting local database..."
+# Use a more robust way to find the container if multiple projects exist locally
+LOCAL_DB_CONTAINER=$(docker compose ps -q directus-db)
+if [ -z "$LOCAL_DB_CONTAINER" ]; then
+    echo "❌ Local directus-db container not found. Is it running? (npm run dev)"
+    exit 1
+fi
+
+if [ "$ACTION" == "push" ]; then
+    echo "🚀 Pushing Local Data to $ENV ($PROJECT_NAME)..."
+    
+    # 1. DB Dump
+    echo "📦 Dumping local database..."
+    # Note: we use --no-owner --no-privileges to ensure restore works on remote with different user setup
+    docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$DB_USER" --clean --if-exists --no-owner --no-privileges "$DB_NAME" > dump.sql
+    
+    # 2. Upload Dump
+    echo "📤 Uploading dump to remote server..."
+    scp dump.sql "$REMOTE_HOST:$REMOTE_DIR/dump.sql"
+    
+    # 3. Restore on Remote
+    echo "🔄 Restoring dump on $ENV..."
+    REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
+    if [ -z "$REMOTE_DB_CONTAINER" ] && [ -n "$OLD_PROJECT_NAME" ]; then
+        echo "⚠️ $PROJECT_NAME not found, trying fallback $OLD_PROJECT_NAME..."
+        REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $OLD_PROJECT_NAME ps -q directus-db")
+    fi
+
+    if [ -z "$REMOTE_DB_CONTAINER" ]; then
+        echo "❌ Remote $ENV-db container not found!"
+        exit 1
+    fi
+
+    # Wipe remote DB clean before restore to avoid constraint errors
+    echo "🧹 Wiping remote database schema..."
+    ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'"
+    
+    echo "⚡ Restoring database..."
+    ssh "$REMOTE_HOST" "docker exec -i $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME < $REMOTE_DIR/dump.sql"
+    
+    # 4. Sync Uploads
+    echo "📁 Syncing uploads (Local -> $ENV)..."
+    # Note: If environments share the same directory, this might overwrite others' files if not careful.
+    # But since they share the same host directory currently, rsync will update the shared folder.
+    rsync -avz --progress ./directus/uploads/ "$REMOTE_HOST:$REMOTE_DIR/directus/uploads/"
+    
+    # Clean up
+    rm dump.sql
+    ssh "$REMOTE_HOST" "rm $REMOTE_DIR/dump.sql"
+    
+    # 5. Restart Directus to trigger migrations and refresh schema cache
+    echo "🔄 Restarting remote Directus to apply migrations..."
+    ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME restart directus"
+    
+    echo "✨ Push to $ENV complete!"
+
+elif [ "$ACTION" == "pull" ]; then
+    echo "📥 Pulling $ENV Data to Local..."
+    
+    # 1. DB Dump on Remote
+    echo "📦 Dumping remote database ($ENV)..."
+    REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
+    if [ -z "$REMOTE_DB_CONTAINER" ] && [ -n "$OLD_PROJECT_NAME" ]; then
+        echo "⚠️ $PROJECT_NAME not found, trying fallback $OLD_PROJECT_NAME..."
+        REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $OLD_PROJECT_NAME ps -q directus-db")
+    fi
+
+    if [ -z "$REMOTE_DB_CONTAINER" ]; then
+        echo "❌ Remote $ENV-db container not found!"
+        exit 1
+    fi
+    ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $DB_USER --clean --if-exists --no-owner --no-privileges $DB_NAME > $REMOTE_DIR/dump.sql"
+    
+    # 2. Download Dump
+    echo "📥 Downloading dump..."
+    scp "$REMOTE_HOST:$REMOTE_DIR/dump.sql" dump.sql
+    
+    # Wipe local DB clean before restore to avoid constraint errors
+    echo "🧹 Wiping local database schema..."
+    docker exec "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'
+    
+    echo "⚡ Restoring database locally..."
+    docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" < dump.sql
+    
+    # 4. Sync Uploads
+    echo "📁 Syncing uploads ($ENV -> Local)..."
+    rsync -avz --progress "$REMOTE_HOST:$REMOTE_DIR/directus/uploads/" ./directus/uploads/
+    
+    # Clean up
+    rm dump.sql
+    ssh "$REMOTE_HOST" "rm $REMOTE_DIR/dump.sql"
+    
+    echo "✨ Pull to Local complete!"
+else
+    echo "Invalid action: $ACTION. Use push or pull."
+    exit 1
+fi
--- a/scripts/update_ampacity.py
+++ b/scripts/update_ampacity.py
@@ -0,0 +1,59 @@
+import openpyxl
+
+def update_excel_ampacity(file_path, headers_row_idx, ampacity_cols_identifiers, target_cross_section="1x1200/35"):
+    print(f"Updating {file_path}...")
+    wb = openpyxl.load_workbook(file_path)
+    ws = wb.active
+    
+    # openpyxl is 1-indexed for rows and columns
+    headers = [cell.value for cell in ws[headers_row_idx]]
+    
+    # Identify column indices for ampacity (0-indexed locally for easier row access)
+    col_indices = []
+    for identifier in ampacity_cols_identifiers:
+        if isinstance(identifier, int):
+            col_indices.append(identifier)
+        else:
+            try:
+                # list.index returns 0-indexed position
+                col_indices.append(headers.index(identifier))
+            except ValueError:
+                print(f"Warning: Could not find column '{identifier}' in {file_path}")
+
+    # Find row index for "Number of cores and cross-section" or use index 8
+    cs_col_idx = 8
+    try:
+        cs_col_idx = headers.index("Number of cores and cross-section")
+    except ValueError:
+        pass
+
+    rows_updated = 0
+    # ws.iter_rows returns 1-indexed rows
+    for row in ws.iter_rows(min_row=headers_row_idx + 1):
+        # row is a tuple of cells, so row[cs_col_idx] is 0-indexed access to the tuple
+        if str(row[cs_col_idx].value).strip() == target_cross_section:
+            for col_idx in col_indices:
+                row[col_idx].value = "On Request"
+            rows_updated += 1
+            
+    wb.save(file_path)
+    print(f"Updated {rows_updated} rows in {file_path}")
+
+# File 1: medium-voltage-KM.xlsx
+update_excel_ampacity(
+    'data/excel/medium-voltage-KM.xlsx',
+    1, # Headers are in first row (1-indexed)
+    [
+        'Current ratings in air, trefoil*',
+        'Current ratings in air, flat*',
+        'Current ratings in ground, trefoil*',
+        'Current ratings in ground, flat*'
+    ]
+)
+
+# File 2: medium-voltage-KM 170126.xlsx
+update_excel_ampacity(
+    'data/excel/medium-voltage-KM 170126.xlsx',
+    1, # Indices 39 and 41 were from a 0-indexed JSON representation
+    [39, 41] 
+)
--- a/scripts/update_excel.py
+++ b/scripts/update_excel.py
@@ -0,0 +1,87 @@
+import openpyxl
+
+excel_path = 'data/excel/medium-voltage-KM.xlsx'
+wb = openpyxl.load_workbook(excel_path)
+ws = wb.active
+
+# Technical data for 1x1200RM/35
+new_rows_data = [
+    {
+        "Rated voltage": "6/10",
+        "Test voltage": 21,
+        "Nominal insulation thickness": 3.4,
+        "Diameter over insulation (approx.)": 48.5,
+        "Minimum sheath thickness": 2.1,
+        "Outer diameter (approx.)": 59,
+        "Bending radius (min.)": 885,
+        "Weight (approx.)": 4800,
+        "Capacitance (approx.)": 0.95,
+        "Inductance, trefoil (approx.)": 0.24,
+        "Inductance in air, flat (approx.)  1": 0.40,
+        "Inductance in ground, flat (approx.)  1": 0.42,
+    },
+    {
+        "Rated voltage": "12/20",
+        "Test voltage": 42,
+        "Nominal insulation thickness": 5.5,
+        "Diameter over insulation (approx.)": 52.3,
+        "Minimum sheath thickness": 2.1,
+        "Outer diameter (approx.)": 66,
+        "Bending radius (min.)": 990,
+        "Weight (approx.)": 5200,
+        "Capacitance (approx.)": 1.05,
+        "Inductance, trefoil (approx.)": 0.23,
+        "Inductance in air, flat (approx.)  1": 0.43,
+        "Inductance in ground, flat (approx.)  1": 0.45,
+    },
+    {
+        "Rated voltage": "18/30",
+        "Test voltage": 63,
+        "Nominal insulation thickness": 8.0,
+        "Diameter over insulation (approx.)": 57.5,
+        "Minimum sheath thickness": 2.4,
+        "Outer diameter (approx.)": 71,
+        "Bending radius (min.)": 1065,
+        "Weight (approx.)": 5900,
+        "Capacitance (approx.)": 1.15,
+        "Inductance, trefoil (approx.)": 0.22,
+        "Inductance in air, flat (approx.)  1": 0.45,
+        "Inductance in ground, flat (approx.)  1": 0.47,
+    }
+]
+
+# Find a template row for NA2XS(F)2Y
+template_row = None
+headers = [cell.value for cell in ws[1]]
+
+for row in ws.iter_rows(min_row=3, values_only=True):
+    if row[0] == 'NA2XS(F)2Y':
+        template_row = list(row)
+        break
+
+if not template_row:
+    print("Error: Could not find template row for NA2XS(F)2Y")
+    exit(1)
+
+# Function to update template with new values
+def create_row(template, updates, headers):
+    new_row = template[:]
+    # Change "Number of cores and cross-section"
+    cs_idx = headers.index("Number of cores and cross-section")
+    new_row[cs_idx] = "1x1200/35"
+    
+    # Apply specific updates
+    for key, value in updates.items():
+        if key in headers:
+            idx = headers.index(key)
+            new_row[idx] = value
+    return new_row
+
+# Append new rows
+for data in new_rows_data:
+    new_row_values = create_row(template_row, data, headers)
+    ws.append(new_row_values)
+    print(f"Added row for {data['Rated voltage']} kV")
+
+wb.save(excel_path)
+print("Excel file updated successfully.")
--- a/scripts/update_excel_v2.py
+++ b/scripts/update_excel_v2.py
@@ -0,0 +1,120 @@
+import openpyxl
+
+excel_path = 'data/excel/medium-voltage-KM 170126.xlsx'
+wb = openpyxl.load_workbook(excel_path)
+ws = wb.active
+
+# Technical data for 1x1200RM/35
+# Indices based on Row 2 (Units) and Row 1
+# Index 0: Part Number
+# Index 8: Querschnitt
+# Index 9: Rated voltage
+# Index 10: Test voltage
+# Index 23: LD mm
+# Index 24: ID mm
+# Index 25: DI mm
+# Index 26: MWD mm
+# Index 27: AD mm
+# Index 28: BR
+# Index 29: G kg
+# Index 30: RI Ohm
+# Index 31: Cap
+# Index 32: Inductance trefoil
+# Index 35: BK
+# Index 39: SBL 30
+# Index 41: SBE 20
+
+new_rows_data = [
+    {
+        "voltage": "6/10",
+        "test_v": 21,
+        "ld": 41.5,
+        "id": 3.4,
+        "di": 48.5,
+        "mwd": 2.1,
+        "ad": 59,
+        "br": 885,
+        "g": 4800,
+        "ri": 0.0247,
+        "cap": 0.95,
+        "ind": 0.24,
+        "bk": 113,
+        "sbl": 1300,
+        "sbe": 933
+    },
+    {
+        "voltage": "12/20",
+        "test_v": 42,
+        "ld": 41.5,
+        "id": 5.5,
+        "di": 52.3,
+        "mwd": 2.1,
+        "ad": 66,
+        "br": 990,
+        "g": 5200,
+        "ri": 0.0247,
+        "cap": 1.05,
+        "ind": 0.23,
+        "bk": 113,
+        "sbl": 1200,
+        "sbe": 900
+    },
+    {
+        "voltage": "18/30",
+        "test_v": 63,
+        "ld": 41.5,
+        "id": 8.0,
+        "di": 57.5,
+        "mwd": 2.4,
+        "ad": 71,
+        "br": 1065,
+        "g": 5900,
+        "ri": 0.0247,
+        "cap": 1.15,
+        "ind": 0.22,
+        "bk": 113,
+        "sbl": 1300,
+        "sbe": 950
+    }
+]
+
+# Find a template row for NA2XS(F)2Y
+template_row = None
+for row in ws.iter_rows(min_row=3, values_only=True):
+    if row[0] == 'NA2XS(F)2Y' and row[9] == '6/10':
+        template_row = list(row)
+        break
+
+if not template_row:
+    print("Error: Could not find template row for NA2XS(F)2Y")
+    exit(1)
+
+# Function to update template with new values
+def create_row(template, data):
+    new_row = template[:]
+    new_row[8] = "1x1200/35"
+    new_row[9] = data["voltage"]
+    new_row[10] = data["test_v"]
+    new_row[23] = data["ld"]
+    new_row[24] = data["id"]
+    new_row[25] = data["di"]
+    new_row[26] = data["mwd"]
+    new_row[27] = data["ad"]
+    new_row[28] = data["br"]
+    new_row[29] = data["g"]
+    new_row[30] = data["ri"]
+    new_row[31] = data["cap"]
+    new_row[32] = data["ind"]
+    new_row[35] = data["bk"]
+    new_row[39] = data["sbl"]
+    new_row[41] = data["sbe"]
+    return new_row
+
+# Append new rows
+for data in new_rows_data:
+    new_row_values = create_row(template_row, data)
+    ws.append(new_row_values)
+    print(f"Added row for {data['voltage']} kV")
+
+wb.save(excel_path)
+print("Excel file updated successfully.")
--- a/styles/globals.css
+++ b/styles/globals.css
@@ -1,7 +1,9 @@
-@import "tailwindcss";
+@import 'tailwindcss';

@theme {
-  --font-sans: 'Inter', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  --font-sans:
+    'Inter', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue',
+    Arial, sans-serif;
  --font-heading: 'Inter', system-ui, sans-serif;
  --font-body: 'Inter', system-ui, sans-serif;

@@ -30,43 +32,82 @@
  --color-success: #10b981;
  --color-warning: #f59e0b;
  --color-danger: #ef4444;
+  --color-destructive: #ef4444;
+  --color-destructive-foreground: #ffffff;
  --color-info: #3b82f6;

  --animate-fade-in: fade-in 0.5s ease-out;
  --animate-slide-up: slide-up 0.6s ease-out;
  --animate-slow-zoom: slow-zoom 20s linear infinite;
  --animate-reveal: reveal 0.8s cubic-bezier(0.16, 1, 0.3, 1) forwards;
-  --animate-slight-fade-in-from-bottom: slight-fade-in-from-bottom 0.8s cubic-bezier(0.16, 1, 0.3, 1) forwards;
+  --animate-slight-fade-in-from-bottom: slight-fade-in-from-bottom 0.8s
+    cubic-bezier(0.16, 1, 0.3, 1) forwards;
  --animate-gradient-x: gradient-x 15s ease infinite;

  @keyframes gradient-x {
-    0%, 100% { background-position: 0% 50%; }
-    50% { background-position: 100% 50%; }
+    0%,
+    100% {
+      background-position: 0% 50%;
+    }
+    50% {
+      background-position: 100% 50%;
+    }
  }
  @keyframes fade-in {
-    from { opacity: 0; }
-    to { opacity: 1; }
+    from {
+      opacity: 0;
+    }
+    to {
+      opacity: 1;
+    }
  }
  @keyframes slide-up {
-    from { opacity: 0; transform: translateY(20px); }
-    to { opacity: 1; transform: translateY(0); }
+    from {
+      opacity: 0;
+      transform: translateY(20px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
  }
  @keyframes slow-zoom {
-    from { transform: scale(1); }
-    to { transform: scale(1.1); }
+    from {
+      transform: scale(1);
+    }
+    to {
+      transform: scale(1.1);
+    }
  }
  @keyframes reveal {
-    from { opacity: 0; transform: translateY(20px); filter: blur(8px); }
-    to { opacity: 1; transform: translateY(0); filter: blur(0); }
+    from {
+      opacity: 0;
+      transform: translateY(20px);
+      filter: blur(8px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+      filter: blur(0);
+    }
  }
  @keyframes slight-fade-in-from-bottom {
-    from { opacity: 0; transform: translateY(10px); filter: blur(4px); }
-    to { opacity: 1; transform: translateY(0); filter: blur(0); }
+    from {
+      opacity: 0;
+      transform: translateY(10px);
+      filter: blur(4px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+      filter: blur(0);
+    }
  }
 }

@layer base {
-  .bg-primary a, .bg-primary-dark a {
+  .bg-primary a,
+  .bg-primary-dark a {
    @apply text-white/90 hover:text-white transition-colors;
  }
  body {
@@ -76,63 +117,81 @@
    -moz-osx-font-smoothing: grayscale;
    line-height: 1.7;
  }
-  
-  h1, h2, h3, h4, h5, h6 {
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
    @apply font-heading font-bold tracking-tight;
    line-height: 1.2;
  }
-  
+
  /* Enhanced Mobile-first typography hierarchy with fluid sizing */
-  h1 { @apply text-3xl md:text-5xl lg:text-6xl leading-[1.1]; }
-  h2 { @apply text-2xl md:text-4xl lg:text-5xl leading-[1.2]; }
-  h3 { @apply text-xl md:text-2xl lg:text-3xl leading-[1.3]; }
-  h4 { @apply text-lg md:text-xl lg:text-2xl leading-[1.4]; }
-  h5 { @apply text-base md:text-lg leading-[1.5]; }
-  h6 { @apply text-sm md:text-base leading-[1.6]; }
-  
+  h1 {
+    @apply text-3xl md:text-5xl lg:text-6xl leading-[1.1];
+  }
+  h2 {
+    @apply text-2xl md:text-4xl lg:text-5xl leading-[1.2];
+  }
+  h3 {
+    @apply text-xl md:text-2xl lg:text-3xl leading-[1.3];
+  }
+  h4 {
+    @apply text-lg md:text-xl lg:text-2xl leading-[1.4];
+  }
+  h5 {
+    @apply text-base md:text-lg leading-[1.5];
+  }
+  h6 {
+    @apply text-sm md:text-base leading-[1.6];
+  }
+
  /* Paragraph and text styles */
  p {
    @apply mb-4 leading-relaxed;
  }
-  
+
  /* Link styles */
  a {
    @apply no-underline transition-all duration-200;
  }
-  
+
  /* List styles */
-  ul, ol {
+  ul,
+  ol {
    @apply my-4 ml-6;
  }
-  
+
  li {
    @apply mb-2 leading-relaxed;
  }
-  
+
  /* Small text */
  small {
    @apply text-sm md:text-base;
  }
-  
+
  /* Strong and emphasis */
  strong {
    @apply font-bold;
  }
-  
+
  em {
    @apply italic;
  }
-  
+
  /* Blockquote */
  blockquote {
    @apply border-l-4 pl-6 my-6 italic;
  }
-  
+
  /* Code */
  code {
    @apply px-2 py-1 rounded font-mono text-sm;
  }
-  
+
  /* Horizontal rule */
  hr {
    @apply my-8;
@@ -177,7 +236,7 @@
    opacity 0.6s ease-out,
    transform 0.8s cubic-bezier(0.16, 1, 0.3, 1),
    filter 0.8s cubic-bezier(0.16, 1, 0.3, 1);
-  
+
  &.is-visible {
    opacity: 1;
    transform: translateY(0);
--- a/tsconfig.tsbuildinfo
+++ b/tsconfig.tsbuildinfo
--- a/varnish/default.vcl
+++ b/varnish/default.vcl
@@ -0,0 +1,102 @@
+vcl 4.1;
+
+import std;
+
+probe default_probe {
+    .url = "/health";
+    .timeout = 2s;
+    .interval = 5s;
+    .window = 5;
+    .threshold = 3;
+}
+
+backend default {
+    .host = "klz-app";
+    .port = "3000";
+    .connect_timeout = 10s;
+    .first_byte_timeout = 300s;
+    .between_bytes_timeout = 10s;
+    .probe = default_probe;
+}
+
+acl purge {
+    "localhost";
+    "127.0.0.1";
+}
+
+sub vcl_recv {
+    # Only allow PURGE from the ACL
+    if (req.method == "PURGE") {
+        if (!client.ip ~ purge) {
+            return (synth(405, "Not allowed."));
+        }
+        return (purge);
+    }
+
+    # Only cache GET and HEAD requests
+    if (req.method != "GET" && req.method != "HEAD") {
+        return (pass);
+    }
+
+    # Bypass cache for Directus and CMS proxy
+    if (req.url ~ "^/directus" || req.url ~ "^/admin" || req.url ~ "^/cms") {
+        return (pass);
+    }
+
+    # Bypass cache for Next.js preview mode / health checks
+    if (req.url ~ "^/api/preview" || req.url ~ "^/health") {
+        return (pass);
+    }
+
+    # Remove all cookies for static files to improve cache hits
+    if (req.url ~ "\.(png|gif|jpg|jpeg|svg|ico|webp|js|css|woff|woff2|otf|ttf)$") {
+        unset req.http.Cookie;
+    }
+
+    # Normalize Cookies: Remove tracking cookies that don't affect page content
+    # This keeps cookies like NEXT_LOCALE or AUTH cookies if needed, but strips others
+    if (req.http.Cookie) {
+        # Strip Google Analytics cookies
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|;\s*)(__utm.|_ga.|_gid.|_gat)(=[^;]*)?", "");
+        # Strip empty cookies
+        set req.http.Cookie = regsub(req.http.Cookie, "^;\s*", "");
+        if (req.http.Cookie ~ "^\s*$") {
+            unset req.http.Cookie;
+        }
+    }
+
+    return (hash);
+}
+
+sub vcl_backend_response {
+    # Cache static assets for a long time
+    if (bereq.url ~ "\.(png|gif|jpg|jpeg|svg|ico|webp|js|css|woff|woff2|otf|ttf)$") {
+        set beresp.ttl = 1w;
+    }
+
+    # Respect Cache-Control from Next.js
+    # If the response should not be cached, Next.js will usually send Cache-Control: no-cache, no-store, etc.
+    if (beresp.http.Cache-Control ~ "private" ||
+        beresp.http.Cache-Control ~ "no-cache" ||
+        beresp.http.Cache-Control ~ "no-store") {
+        set beresp.uncacheable = true;
+        return (deliver);
+    }
+
+    # Set a default TTL if none is provided by the backend
+    if (beresp.ttl <= 0s) {
+        set beresp.ttl = 120s;
+    }
+
+    return (deliver);
+}
+
+sub vcl_deliver {
+    # Add a debug header to show if it was a hit or miss
+    if (obj.hits > 0) {
+        set resp.http.X-Cache = "HIT";
+        set resp.http.X-Cache-Hits = obj.hits;
+    } else {
+        set resp.http.X-Cache = "MISS";
+    }
+}