diff --git a/apps/calendar/apps/web/vite.config.ts b/apps/calendar/apps/web/vite.config.ts
index f224a3697..b2c3a5d06 100644
--- a/apps/calendar/apps/web/vite.config.ts
+++ b/apps/calendar/apps/web/vite.config.ts
@@ -1,15 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5179,
-	additionalPackages: ['@calendar/shared'],
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5179,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES, '@calendar/shared'],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES, '@calendar/shared'],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/chat/apps/web/vite.config.ts b/apps/chat/apps/web/vite.config.ts
index 2101aa70b..0f2964de7 100644
--- a/apps/chat/apps/web/vite.config.ts
+++ b/apps/chat/apps/web/vite.config.ts
@@ -1,15 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5174,
-	additionalPackages: ['marked'],
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5174,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES, 'marked'],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES, 'marked'],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/clock/apps/web/vite.config.ts b/apps/clock/apps/web/vite.config.ts
index c9190c734..1bd24ba86 100644
--- a/apps/clock/apps/web/vite.config.ts
+++ b/apps/clock/apps/web/vite.config.ts
@@ -1,13 +1,17 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5187,
+export default defineConfig({
+	plugins: [sveltekit()],
+	server: {
+		port: 5187,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [sveltekit()],
-	})
-);
diff --git a/apps/contacts/apps/web/vite.config.ts b/apps/contacts/apps/web/vite.config.ts
index e20d7dad2..2143332bd 100644
--- a/apps/contacts/apps/web/vite.config.ts
+++ b/apps/contacts/apps/web/vite.config.ts
@@ -1,14 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5184,
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5184,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/manacore/apps/web/vite.config.ts b/apps/manacore/apps/web/vite.config.ts
index 7781dc3cb..99633ae05 100644
--- a/apps/manacore/apps/web/vite.config.ts
+++ b/apps/manacore/apps/web/vite.config.ts
@@ -1,18 +1,22 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5173,
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5173,
+		strictPort: true,
+	},
+	preview: {
+		port: 4173,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-		preview: {
-			port: 4173,
-			strictPort: true,
-		},
-	})
-);
diff --git a/apps/manadeck/apps/web/vite.config.ts b/apps/manadeck/apps/web/vite.config.ts
index 1c4e71978..00aac1dd8 100644
--- a/apps/manadeck/apps/web/vite.config.ts
+++ b/apps/manadeck/apps/web/vite.config.ts
@@ -1,14 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5176,
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5176,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/matrix/apps/web/src/lib/stores/navigation.ts b/apps/matrix/apps/web/src/lib/stores/navigation.ts
index 1aa65fb22..f15f25afd 100644
--- a/apps/matrix/apps/web/src/lib/stores/navigation.ts
+++ b/apps/matrix/apps/web/src/lib/stores/navigation.ts
@@ -24,6 +24,9 @@ export const isSidebarMode = {
 	get value() {
 		return _isSidebarMode;
 	},
+	set(value: boolean) {
+		_isSidebarMode = value;
+	},
 };
 
 export const isNavCollapsed = {
diff --git a/apps/nutriphi/apps/web/vite.config.ts b/apps/nutriphi/apps/web/vite.config.ts
index efd398596..8ab09045a 100644
--- a/apps/nutriphi/apps/web/vite.config.ts
+++ b/apps/nutriphi/apps/web/vite.config.ts
@@ -1,15 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5180,
-	additionalPackages: ['@nutriphi/shared'],
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5180,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES, '@nutriphi/shared'],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES, '@nutriphi/shared'],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/picture/apps/web/vite.config.ts b/apps/picture/apps/web/vite.config.ts
index c2f3784a7..56e184a0b 100644
--- a/apps/picture/apps/web/vite.config.ts
+++ b/apps/picture/apps/web/vite.config.ts
@@ -1,14 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5175,
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5175,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/planta/apps/web/vite.config.ts b/apps/planta/apps/web/vite.config.ts
index 8504d80f0..82a5c9558 100644
--- a/apps/planta/apps/web/vite.config.ts
+++ b/apps/planta/apps/web/vite.config.ts
@@ -1,15 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5191,
-	additionalPackages: ['@planta/shared'],
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5191,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES, '@planta/shared'],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES, '@planta/shared'],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/presi/apps/web/vite.config.ts b/apps/presi/apps/web/vite.config.ts
index 8f689108c..072fd8a67 100644
--- a/apps/presi/apps/web/vite.config.ts
+++ b/apps/presi/apps/web/vite.config.ts
@@ -2,25 +2,27 @@ import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
 import path from 'path';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5178,
-});
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-		server: {
-			fs: {
-				allow: [
-					path.resolve(__dirname, '../../../../node_modules'),
-					path.resolve(__dirname, 'src'),
-					path.resolve(__dirname, '.svelte-kit'),
-					path.resolve(__dirname, 'node_modules'),
-					path.resolve(__dirname, '../../node_modules'),
-				],
-			},
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5178,
+		strictPort: true,
+		fs: {
+			allow: [
+				path.resolve(__dirname, '../../../../node_modules'),
+				path.resolve(__dirname, 'src'),
+				path.resolve(__dirname, '.svelte-kit'),
+				path.resolve(__dirname, 'node_modules'),
+				path.resolve(__dirname, '../../node_modules'),
+			],
 		},
-	})
-);
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES],
+	},
+});
diff --git a/apps/questions/apps/web/vite.config.ts b/apps/questions/apps/web/vite.config.ts
index f6beead31..3e73eced5 100644
--- a/apps/questions/apps/web/vite.config.ts
+++ b/apps/questions/apps/web/vite.config.ts
@@ -1,14 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5111,
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5111,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/storage/apps/web/vite.config.ts b/apps/storage/apps/web/vite.config.ts
index f604de72e..4d7984a03 100644
--- a/apps/storage/apps/web/vite.config.ts
+++ b/apps/storage/apps/web/vite.config.ts
@@ -1,15 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5185,
-	additionalPackages: ['lucide-svelte'],
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5185,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES, 'lucide-svelte'],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES, 'lucide-svelte'],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);
diff --git a/apps/todo/apps/web/vite.config.ts b/apps/todo/apps/web/vite.config.ts
index 4e24ac33a..b7d0ccd45 100644
--- a/apps/todo/apps/web/vite.config.ts
+++ b/apps/todo/apps/web/vite.config.ts
@@ -1,15 +1,18 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
-import { createViteConfig, mergeViteConfig } from '@manacore/shared-vite-config';
+import { MANACORE_SHARED_PACKAGES } from '@manacore/shared-vite-config';
 
-const baseConfig = createViteConfig({
-	port: 5188,
-	additionalPackages: ['@todo/shared'],
+export default defineConfig({
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		port: 5188,
+		strictPort: true,
+	},
+	ssr: {
+		noExternal: [...MANACORE_SHARED_PACKAGES, '@todo/shared'],
+	},
+	optimizeDeps: {
+		exclude: [...MANACORE_SHARED_PACKAGES, '@todo/shared'],
+	},
 });
-
-export default defineConfig(
-	mergeViteConfig(baseConfig, {
-		plugins: [tailwindcss(), sveltekit()],
-	})
-);