diff --git a/apps/web/app/(marketing)/_components/site-header-account-section.tsx b/apps/web/app/(marketing)/_components/site-header-account-section.tsx
index 0f1f4c030..900302f5c 100644
--- a/apps/web/app/(marketing)/_components/site-header-account-section.tsx
+++ b/apps/web/app/(marketing)/_components/site-header-account-section.tsx
@@ -11,6 +11,7 @@ import { PersonalAccountDropdown } from '@kit/accounts/personal-account-dropdown
 import { useSignOut } from '@kit/supabase/hooks/use-sign-out';
 import { useUser } from '@kit/supabase/hooks/use-user';
 import { Button } from '@kit/ui/button';
+import { If } from '@kit/ui/if';
 import { Trans } from '@kit/ui/trans';
 
 import featuresFlagConfig from '~/config/feature-flags.config';
@@ -69,7 +70,9 @@ function AuthButtons() {
   return (
     <div className={'flex space-x-2'}>
       <div className={'hidden space-x-0.5 md:flex'}>
-        <ModeToggle className={textClassName} />
+        <If condition={features.enableThemeToggle}>
+          <ModeToggle className={textClassName} />
+        </If>
 
         <Button asChild variant={'ghost'} className={textClassName}>
           <Link href={pathsConfig.auth.signIn}>
diff --git a/apps/web/package.json b/apps/web/package.json
index 31c5db48d..693f2740c 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -70,7 +70,7 @@
     "recharts": "^2.12.7",
     "sonner": "^1.4.41",
     "tailwind-merge": "^2.3.0",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@kit/eslint-config": "workspace:^",
diff --git a/packages/billing/core/package.json b/packages/billing/core/package.json
index ca9bff3bd..f95bd9a88 100644
--- a/packages/billing/core/package.json
+++ b/packages/billing/core/package.json
@@ -22,7 +22,7 @@
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:*",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/billing/gateway/package.json b/packages/billing/gateway/package.json
index 52c830e3c..e2d2fc695 100644
--- a/packages/billing/gateway/package.json
+++ b/packages/billing/gateway/package.json
@@ -35,7 +35,7 @@
     "react": "18.3.1",
     "react-hook-form": "^7.51.4",
     "react-i18next": "^14.1.1",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/billing/lemon-squeezy/package.json b/packages/billing/lemon-squeezy/package.json
index a76cbf2df..fd98d6baf 100644
--- a/packages/billing/lemon-squeezy/package.json
+++ b/packages/billing/lemon-squeezy/package.json
@@ -28,7 +28,7 @@
     "@types/react": "^18.3.1",
     "next": "14.2.3",
     "react": "18.3.1",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/billing/stripe/package.json b/packages/billing/stripe/package.json
index ba69af331..ec1ec5cfb 100644
--- a/packages/billing/stripe/package.json
+++ b/packages/billing/stripe/package.json
@@ -32,7 +32,7 @@
     "date-fns": "^3.6.0",
     "next": "14.2.3",
     "react": "18.3.1",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/cms/keystatic/package.json b/packages/cms/keystatic/package.json
index 9837785ba..af730389b 100644
--- a/packages/cms/keystatic/package.json
+++ b/packages/cms/keystatic/package.json
@@ -28,7 +28,7 @@
     "@types/node": "^20.12.8",
     "@types/react": "^18.3.1",
     "react": "18.3.1",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/database-webhooks/package.json b/packages/database-webhooks/package.json
index 8f31ca91f..a4a557ce3 100644
--- a/packages/database-webhooks/package.json
+++ b/packages/database-webhooks/package.json
@@ -24,7 +24,7 @@
     "@kit/team-accounts": "workspace:^",
     "@kit/tsconfig": "workspace:*",
     "@supabase/supabase-js": "^2.43.1",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/features/accounts/package.json b/packages/features/accounts/package.json
index 45e4d6a86..bea5cde96 100644
--- a/packages/features/accounts/package.json
+++ b/packages/features/accounts/package.json
@@ -45,7 +45,7 @@
     "react-hook-form": "^7.51.4",
     "react-i18next": "^14.1.1",
     "sonner": "^1.4.41",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "prettier": "@kit/prettier-config",
   "eslintConfig": {
diff --git a/packages/features/admin/package.json b/packages/features/admin/package.json
index aa55a3d24..dc220515e 100644
--- a/packages/features/admin/package.json
+++ b/packages/features/admin/package.json
@@ -29,7 +29,7 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-hook-form": "^7.51.4",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "exports": {
     ".": "./src/index.ts",
diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json
index 88be9abaa..f984ecea9 100644
--- a/packages/features/auth/package.json
+++ b/packages/features/auth/package.json
@@ -36,7 +36,7 @@
     "react-hook-form": "^7.51.4",
     "react-i18next": "^14.1.1",
     "sonner": "^1.4.41",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "prettier": "@kit/prettier-config",
   "eslintConfig": {
diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json
index 429c633ae..8f5522b0b 100644
--- a/packages/features/team-accounts/package.json
+++ b/packages/features/team-accounts/package.json
@@ -45,7 +45,7 @@
     "react-hook-form": "^7.51.4",
     "react-i18next": "^14.1.1",
     "sonner": "^1.4.41",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "prettier": "@kit/prettier-config",
   "eslintConfig": {
diff --git a/packages/mailers/package.json b/packages/mailers/package.json
index ac8dd18c9..da38ac4e7 100644
--- a/packages/mailers/package.json
+++ b/packages/mailers/package.json
@@ -22,7 +22,7 @@
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
     "@types/nodemailer": "6.4.15",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/monitoring/baselime/package.json b/packages/monitoring/baselime/package.json
index 44cef6dac..8dba2bd94 100644
--- a/packages/monitoring/baselime/package.json
+++ b/packages/monitoring/baselime/package.json
@@ -27,7 +27,7 @@
     "@kit/tsconfig": "workspace:*",
     "@types/react": "^18.3.1",
     "react": "18.3.1",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/next/package.json b/packages/next/package.json
index af0130d66..f84802c25 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -23,7 +23,7 @@
     "@kit/tsconfig": "workspace:*",
     "@supabase/supabase-js": "^2.43.1",
     "next": "14.2.3",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/supabase/package.json b/packages/supabase/package.json
index 5aa9210ee..9f121fe24 100644
--- a/packages/supabase/package.json
+++ b/packages/supabase/package.json
@@ -32,7 +32,7 @@
     "@types/react": "^18.3.1",
     "next": "14.2.3",
     "react": "18.3.1",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/packages/ui/package.json b/packages/ui/package.json
index b07c289ef..cb2d87014 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -57,7 +57,7 @@
     "tailwindcss": "3.4.3",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "^5.4.5",
-    "zod": "^3.23.7"
+    "zod": "^3.23.8"
   },
   "eslintConfig": {
     "root": true,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d7d460514..f3d2cddcb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -169,8 +169,8 @@ importers:
         specifier: ^2.3.0
         version: 2.3.0
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
     devDependencies:
       '@kit/eslint-config':
         specifier: workspace:^
@@ -242,8 +242,8 @@ importers:
         specifier: workspace:*
         version: link:../../ui
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/billing/gateway:
     devDependencies:
@@ -305,8 +305,8 @@ importers:
         specifier: ^14.1.1
         version: 14.1.1(i18next@23.11.3)(react-dom@18.3.1)(react@18.3.1)
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/billing/lemon-squeezy:
     dependencies:
@@ -348,8 +348,8 @@ importers:
         specifier: 18.3.1
         version: 18.3.1
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/billing/stripe:
     dependencies:
@@ -400,8 +400,8 @@ importers:
         specifier: 18.3.1
         version: 18.3.1
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/cms/core:
     devDependencies:
@@ -455,8 +455,8 @@ importers:
         specifier: 18.3.1
         version: 18.3.1
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/cms/wordpress:
     devDependencies:
@@ -518,8 +518,8 @@ importers:
         specifier: ^2.43.1
         version: 2.43.1
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/email-templates:
     dependencies:
@@ -628,8 +628,8 @@ importers:
         specifier: ^1.4.41
         version: 1.4.41(react-dom@18.3.1)(react@18.3.1)
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/features/admin:
     devDependencies:
@@ -691,8 +691,8 @@ importers:
         specifier: ^7.51.4
         version: 7.51.4(react@18.3.1)
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/features/auth:
     devDependencies:
@@ -751,8 +751,8 @@ importers:
         specifier: ^1.4.41
         version: 1.4.41(react-dom@18.3.1)(react@18.3.1)
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/features/notifications:
     devDependencies:
@@ -887,8 +887,8 @@ importers:
         specifier: ^1.4.41
         version: 1.4.41(react-dom@18.3.1)(react@18.3.1)
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/i18n:
     dependencies:
@@ -949,8 +949,8 @@ importers:
         specifier: 6.4.15
         version: 6.4.15
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/monitoring/api:
     devDependencies:
@@ -1013,8 +1013,8 @@ importers:
         specifier: 18.3.1
         version: 18.3.1
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/monitoring/core:
     devDependencies:
@@ -1107,8 +1107,8 @@ importers:
         specifier: 14.2.3
         version: 14.2.3(@opentelemetry/api@1.8.0)(react-dom@18.3.1)(react@18.3.1)
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/shared:
     dependencies:
@@ -1168,8 +1168,8 @@ importers:
         specifier: 18.3.1
         version: 18.3.1
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   packages/ui:
     dependencies:
@@ -1313,8 +1313,8 @@ importers:
         specifier: ^5.4.5
         version: 5.4.5
       zod:
-        specifier: ^3.23.7
-        version: 3.23.7
+        specifier: ^3.23.8
+        version: 3.23.8
 
   tooling/eslint:
     dependencies:
@@ -2245,7 +2245,7 @@ packages:
       y-prosemirror: 1.2.3(prosemirror-model@1.21.0)(prosemirror-state@1.4.3)(prosemirror-view@1.33.6)(y-protocols@1.0.6)(yjs@13.6.15)
       y-protocols: 1.0.6(yjs@13.6.15)
       yjs: 13.6.15
-      zod: 3.23.7
+      zod: 3.23.8
     transitivePeerDependencies:
       - next
       - supports-color
@@ -12848,8 +12848,8 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  /zod@3.23.7:
-    resolution: {integrity: sha512-NBeIoqbtOiUMomACV/y+V3Qfs9+Okr18vR5c/5pHClPpufWOrsx8TENboDPe265lFdfewX2yBtNTLPvnmCxwog==}
+  /zod@3.23.8:
+    resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
 
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}