diff --git a/kitchen-sink/react/components/App.jsx b/kitchen-sink/react/components/App.jsx
index 1920cb3f..abb5aab7 100644
--- a/kitchen-sink/react/components/App.jsx
+++ b/kitchen-sink/react/components/App.jsx
@@ -6,7 +6,9 @@ import routes from '../routes.js';
 import HomePage from '../pages/Home.jsx';
 
 function App() {
-  const [theme, setTheme] = useState('ios');
+  const [theme, setTheme] = useState(
+    window.location.search.includes('theme=material') ? 'material' : 'ios'
+  );
   const [currentColorTheme, setCurrentColorTheme] = useState('');
   const setColorTheme = (color) => {
     const htmlEl = document.documentElement;
diff --git a/kitchen-sink/svelte/components/App.svelte b/kitchen-sink/svelte/components/App.svelte
index debf2f3a..4ac63a49 100644
--- a/kitchen-sink/svelte/components/App.svelte
+++ b/kitchen-sink/svelte/components/App.svelte
@@ -1,13 +1,11 @@
 <script>
-  import { onMount, beforeUpdate } from 'svelte';
+  import { onMount, onDestroy, beforeUpdate } from 'svelte';
   import { App } from 'konsta/svelte';
-  import { Router, Route, createHistory } from 'svelte-navigator';
-  import createHashSource from '../hashHistory.js';
 
   import routes from '../routes.js';
   import HomePage from '../pages/Home.svelte';
 
-  let theme = 'ios';
+  let theme = window.location.search.includes('theme=material') ? 'material' : 'ios';
   const setTheme = (t) => {
     theme = t;
   };
@@ -42,29 +40,36 @@
     }
   };
 
+  let hash = window.location.hash || '';
+  function updateHash() {
+    hash = window.location.hash;
+  }
+
   onMount(() => {
     calcSafeAreas();
+    window.addEventListener('popstate', updateHash);
   });
 
   beforeUpdate(() => {
     calcSafeAreas();
   });
 
-  const hash = createHistory(createHashSource());
+  onDestroy(() => {
+    window.removeEventListener('popstate', updateHash);
+  });
+
+  $: component = routes.find(route => route.path === hash.slice(1))?.component;
 </script>
 
 <App {theme} safeAreas={!inIFrame}>
-  <Router history={hash} primary={false}>
-    <Route path="/">
-      <HomePage
-        {theme}
-        {setTheme}
-        colorTheme={currentColorTheme}
-        {setColorTheme}
-      />
-    </Route>
-    {#each routes as route}
-      <Route path={route.path} component={route.component} />
-    {/each}
-  </Router>
+  {#if component}
+    <svelte:component this={component} />
+  {:else}
+    <HomePage
+      {theme}
+      {setTheme}
+      colorTheme={currentColorTheme}
+      {setColorTheme}
+    />
+  {/if}
 </App>
diff --git a/kitchen-sink/svelte/hashHistory.js b/kitchen-sink/svelte/hashHistory.js
deleted file mode 100644
index c41725a8..00000000
--- a/kitchen-sink/svelte/hashHistory.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { createHashHistory } from 'history';
-
-function createHashSource(basename) {
-  const history = createHashHistory({ basename });
-  let listeners = [];
-
-  history.listen((location) => {
-    if (history.action === 'POP') {
-      listeners.forEach((listener) => listener(location));
-    }
-  });
-
-  return {
-    get location() {
-      return history.location;
-    },
-    addEventListener(name, handler) {
-      if (name !== 'popstate') return;
-      listeners.push(handler);
-    },
-    removeEventListener(name, handler) {
-      if (name !== 'popstate') return;
-      listeners = listeners.filter((fn) => fn !== handler);
-    },
-    history: {
-      get state() {
-        return history.location.state;
-      },
-      pushState(state, title, uri) {
-        history.push(uri, state);
-      },
-      replaceState(state, title, uri) {
-        history.replace(uri, state);
-      },
-      go(to) {
-        history.go(to);
-      },
-    },
-  };
-}
-
-export default createHashSource;
diff --git a/kitchen-sink/vue/components/App.vue b/kitchen-sink/vue/components/App.vue
index a6f21130..31650e58 100644
--- a/kitchen-sink/vue/components/App.vue
+++ b/kitchen-sink/vue/components/App.vue
@@ -12,7 +12,9 @@
       kApp,
     },
     setup() {
-      const theme = ref('ios');
+      const theme = ref(
+        window.location.search.includes('theme=material') ? 'material' : 'ios'
+      );
       const currentColorTheme = ref('');
       const setColorTheme = (color) => {
         const htmlEl = document.documentElement;
diff --git a/package-lock.json b/package-lock.json
index 3c64d45a..00ec2235 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,6 @@
         "react-router-dom": "^6.26.1",
         "rollup": "^4.21.0",
         "svelte": "^5.0.0-next.241",
-        "svelte-navigator": "^3.2.2",
         "tailwindcss": "^3.4.10",
         "vite": "^5.4.2",
         "vue": "^3.4.38",
@@ -4154,12 +4153,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/dedent-js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dedent-js/-/dedent-js-1.0.1.tgz",
-      "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==",
-      "dev": true
-    },
     "node_modules/deep-equal": {
       "version": "2.2.0",
       "dev": true,
@@ -6628,15 +6621,6 @@
         "loose-envify": "cli.js"
       }
     },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "dev": true,
@@ -7040,16 +7024,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/node-releases": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
@@ -7477,16 +7451,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/path-exists": {
       "version": "3.0.0",
       "dev": true,
@@ -8611,31 +8575,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/svelte-navigator": {
-      "version": "3.2.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "svelte2tsx": "^0.1.151"
-      },
-      "peerDependencies": {
-        "svelte": "3.x"
-      }
-    },
-    "node_modules/svelte-navigator/node_modules/svelte2tsx": {
-      "version": "0.1.193",
-      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.193.tgz",
-      "integrity": "sha512-vzy4YQNYDnoqp2iZPnJy7kpPAY6y121L0HKrSBjU/IWW7DQ6T7RMJed2VVHFmVYm0zAGYMDl9urPc6R4DDUyhg==",
-      "dev": true,
-      "dependencies": {
-        "dedent-js": "^1.0.1",
-        "pascal-case": "^3.1.1"
-      },
-      "peerDependencies": {
-        "svelte": "^3.24",
-        "typescript": "^4.1.2"
-      }
-    },
     "node_modules/svelte/node_modules/axobject-query": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
@@ -8886,6 +8825,7 @@
       "version": "4.6.3",
       "dev": true,
       "license": "Apache-2.0",
+      "optional": true,
       "peer": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -12044,12 +11984,6 @@
         }
       }
     },
-    "dedent-js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dedent-js/-/dedent-js-1.0.1.tgz",
-      "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==",
-      "dev": true
-    },
     "deep-equal": {
       "version": "2.2.0",
       "dev": true,
@@ -13640,15 +13574,6 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "requires": {
-        "tslib": "^2.0.3"
-      }
-    },
     "lru-cache": {
       "version": "6.0.0",
       "dev": true,
@@ -13907,16 +13832,6 @@
       "version": "1.0.5",
       "dev": true
     },
-    "no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "requires": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
     "node-releases": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
@@ -14184,16 +14099,6 @@
         "json-parse-better-errors": "^1.0.1"
       }
     },
-    "pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
     "path-exists": {
       "version": "3.0.0",
       "dev": true
@@ -14900,25 +14805,6 @@
         }
       }
     },
-    "svelte-navigator": {
-      "version": "3.2.2",
-      "dev": true,
-      "requires": {
-        "svelte2tsx": "^0.1.151"
-      },
-      "dependencies": {
-        "svelte2tsx": {
-          "version": "0.1.193",
-          "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.193.tgz",
-          "integrity": "sha512-vzy4YQNYDnoqp2iZPnJy7kpPAY6y121L0HKrSBjU/IWW7DQ6T7RMJed2VVHFmVYm0zAGYMDl9urPc6R4DDUyhg==",
-          "dev": true,
-          "requires": {
-            "dedent-js": "^1.0.1",
-            "pascal-case": "^3.1.1"
-          }
-        }
-      }
-    },
     "synckit": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
@@ -15091,6 +14977,7 @@
     "typescript": {
       "version": "4.6.3",
       "dev": true,
+      "optional": true,
       "peer": true
     },
     "uglify-js": {
diff --git a/package.json b/package.json
index 649f2eb0..db82acc8 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
     "react-router-dom": "^6.26.1",
     "rollup": "^4.21.0",
     "svelte": "^5.0.0-next.241",
-    "svelte-navigator": "^3.2.2",
     "tailwindcss": "^3.4.10",
     "vite": "^5.4.2",
     "vue": "^3.4.38",
@@ -73,4 +72,4 @@
   "dependencies": {
     "konsta": "file:src"
   }
-}
\ No newline at end of file
+}