diff --git a/.gitignore b/.gitignore
index ff1ef05..dcbe5fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ storybook-static/
 # Test Coverage
 coverage/
 
+.react-router/
+
 # Playwright
 /test-results/
 /playwright-report/
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4bd8fb4..899d797 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "npm.packageManager": "pnpm"
+  "npm.packageManager": "pnpm",
+  "typescript.preferences.preferTypeOnlyAutoImports": true
 }
diff --git a/package.json b/package.json
index 391f6fd..98ddafe 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "dev": "vite serve",
     "build": "vite build",
     "preview": "vite preview",
+    "typecheck": "tsc -b",
     "test": "vitest",
     "coverage": "vitest run --coverage",
     "e2e": "playwright test",
@@ -18,7 +19,6 @@
     "lint": "eslint src/ --ext .tsx,.jsx,.js,.ts",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build",
-    "build-typescript": "tsc -b",
     "format:check": "prettier --check .",
     "format:write": "prettier --write ."
   },
@@ -72,7 +72,6 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-storybook": "^0.6.15",
     "eslint-plugin-unicorn": "^55.0.0",
-    "lightningcss": "^1.22.0",
     "msw": "^1.3.3",
     "nx": "20.1.4",
     "postcss": "^8.4.41",
@@ -96,7 +95,7 @@
     "dexie-react-hooks": "^1.1.7",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.0.1",
+    "react-router": "^7.0.2",
     "theme-change": "^2.5.0",
     "uuid": "^9.0.0"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b22744e..8444565 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -30,8 +30,8 @@ importers:
         specifier: ^18.3.1
         version: 18.3.1(react@18.3.1)
       react-router:
-        specifier: ^7.0.1
-        version: 7.0.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: ^7.0.2
+        version: 7.0.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       theme-change:
         specifier: ^2.5.0
         version: 2.5.0
@@ -159,9 +159,6 @@ importers:
       eslint-plugin-unicorn:
         specifier: ^55.0.0
         version: 55.0.0(eslint@8.57.0)
-      lightningcss:
-        specifier: ^1.22.0
-        version: 1.22.0
       msw:
         specifier: ^1.3.3
         version: 1.3.3(typescript@5.7.2)
@@ -8345,6 +8342,16 @@ packages:
       react-dom:
         optional: true
 
+  react-router@7.0.2:
+    resolution: {integrity: sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==}
+    engines: {node: '>=20.0.0'}
+    peerDependencies:
+      react: '>=18'
+      react-dom: '>=18'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+
   react-style-singleton@2.2.1:
     resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
     engines: {node: '>=10'}
@@ -16060,7 +16067,8 @@ snapshots:
 
   detect-indent@6.1.0: {}
 
-  detect-libc@1.0.3: {}
+  detect-libc@1.0.3:
+    optional: true
 
   detect-newline@3.1.0: {}
 
@@ -18181,6 +18189,7 @@ snapshots:
       lightningcss-linux-x64-gnu: 1.22.0
       lightningcss-linux-x64-musl: 1.22.0
       lightningcss-win32-x64-msvc: 1.22.0
+    optional: true
 
   lilconfig@2.1.0: {}
 
@@ -19896,6 +19905,16 @@ snapshots:
     optionalDependencies:
       react-dom: 18.3.1(react@18.3.1)
 
+  react-router@7.0.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      '@types/cookie': 0.6.0
+      cookie: 1.0.2
+      react: 18.3.1
+      set-cookie-parser: 2.7.1
+      turbo-stream: 2.4.0
+    optionalDependencies:
+      react-dom: 18.3.1(react@18.3.1)
+
   react-style-singleton@2.2.1(@types/react@18.3.4)(react@18.3.1):
     dependencies:
       get-nonce: 1.0.1
diff --git a/src/layouts/base-layout.tsx b/src/layouts/base-layout.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/tsconfig.json b/tsconfig.json
index f010fa5..dda1df2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -22,5 +22,5 @@
     "noImplicitAny": true,
     "skipLibCheck": true
   },
-  "include": ["src"]
+  "include": ["src", "vite-env.d.ts"]
 }
diff --git a/vite-env.d.ts b/vite-env.d.ts
index 85ad244..f79cebf 100644
--- a/vite-env.d.ts
+++ b/vite-env.d.ts
@@ -1,2 +1,3 @@
 /// <reference types="vite/client" />
+/// <reference types="vite/types/importMeta.d.ts" />
 declare const APP_VERSION;