diff --git a/website/src/lib/components/ModeSwitch.svelte b/website/src/lib/components/ModeSwitch.svelte
index 02546591..f1ba417a 100644
--- a/website/src/lib/components/ModeSwitch.svelte
+++ b/website/src/lib/components/ModeSwitch.svelte
@@ -3,22 +3,19 @@
     import { Moon, Sun } from '@lucide/svelte';
     import { mode, setMode } from 'mode-watcher';
     import { i18n } from '$lib/i18n.svelte';
-
-    export let size = '20';
 </script>
 
 <Button
     variant="ghost"
     size="icon"
-    class="h-8 px-1.5 {$$props.class ?? ''}"
     onclick={() => {
         setMode(mode.current === 'light' ? 'dark' : 'light');
     }}
     aria-label={i18n._('menu.mode')}
 >
     {#if mode.current === 'light'}
-        <Sun {size} />
+        <Sun />
     {:else}
-        <Moon {size} />
+        <Moon />
     {/if}
 </Button>
diff --git a/website/src/lib/docs/be/toolbar.mdx b/website/src/lib/docs/be/toolbar.mdx
index a12e26f4..dfc969b8 100644
--- a/website/src/lib/docs/be/toolbar.mdx
+++ b/website/src/lib/docs/be/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/ca/toolbar.mdx b/website/src/lib/docs/ca/toolbar.mdx
index 438a1bc4..4380cbba 100644
--- a/website/src/lib/docs/ca/toolbar.mdx
+++ b/website/src/lib/docs/ca/toolbar.mdx
@@ -4,7 +4,7 @@ title: Barra d'eines
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/cs/toolbar.mdx b/website/src/lib/docs/cs/toolbar.mdx
index fb469885..9b42d252 100644
--- a/website/src/lib/docs/cs/toolbar.mdx
+++ b/website/src/lib/docs/cs/toolbar.mdx
@@ -4,7 +4,7 @@ title: Panel nástrojů
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/da/toolbar.mdx b/website/src/lib/docs/da/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/da/toolbar.mdx
+++ b/website/src/lib/docs/da/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/de/toolbar.mdx b/website/src/lib/docs/de/toolbar.mdx
index c6566b0c..1dcc2884 100644
--- a/website/src/lib/docs/de/toolbar.mdx
+++ b/website/src/lib/docs/de/toolbar.mdx
@@ -4,7 +4,7 @@ title: Werkzeugleiste
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/el/toolbar.mdx b/website/src/lib/docs/el/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/el/toolbar.mdx
+++ b/website/src/lib/docs/el/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/en/toolbar.mdx b/website/src/lib/docs/en/toolbar.mdx
index 6d729ac0..6cd4643c 100644
--- a/website/src/lib/docs/en/toolbar.mdx
+++ b/website/src/lib/docs/en/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/es/toolbar.mdx b/website/src/lib/docs/es/toolbar.mdx
index ffb32f6b..b495c90d 100644
--- a/website/src/lib/docs/es/toolbar.mdx
+++ b/website/src/lib/docs/es/toolbar.mdx
@@ -4,7 +4,7 @@ title: Barra de herramientas
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/eu/toolbar.mdx b/website/src/lib/docs/eu/toolbar.mdx
index d4acd0d4..c5cb772a 100644
--- a/website/src/lib/docs/eu/toolbar.mdx
+++ b/website/src/lib/docs/eu/toolbar.mdx
@@ -4,7 +4,7 @@ title: Tresna-barra
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/fi/toolbar.mdx b/website/src/lib/docs/fi/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/fi/toolbar.mdx
+++ b/website/src/lib/docs/fi/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/fr/toolbar.mdx b/website/src/lib/docs/fr/toolbar.mdx
index d8f4ee5c..9d290a3f 100644
--- a/website/src/lib/docs/fr/toolbar.mdx
+++ b/website/src/lib/docs/fr/toolbar.mdx
@@ -4,7 +4,7 @@ title: Barre d'outils
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/he/toolbar.mdx b/website/src/lib/docs/he/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/he/toolbar.mdx
+++ b/website/src/lib/docs/he/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/hu/toolbar.mdx b/website/src/lib/docs/hu/toolbar.mdx
index f4d6647a..1d6f48ea 100644
--- a/website/src/lib/docs/hu/toolbar.mdx
+++ b/website/src/lib/docs/hu/toolbar.mdx
@@ -4,7 +4,7 @@ title: Eszköztár
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/it/toolbar.mdx b/website/src/lib/docs/it/toolbar.mdx
index 18df0b09..260066b3 100644
--- a/website/src/lib/docs/it/toolbar.mdx
+++ b/website/src/lib/docs/it/toolbar.mdx
@@ -4,7 +4,7 @@ title: Barra degli strumenti
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/ko/toolbar.mdx b/website/src/lib/docs/ko/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/ko/toolbar.mdx
+++ b/website/src/lib/docs/ko/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/lt/toolbar.mdx b/website/src/lib/docs/lt/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/lt/toolbar.mdx
+++ b/website/src/lib/docs/lt/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/lv/toolbar.mdx b/website/src/lib/docs/lv/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/lv/toolbar.mdx
+++ b/website/src/lib/docs/lv/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/nl/toolbar.mdx b/website/src/lib/docs/nl/toolbar.mdx
index 9f686b2b..f46767bc 100644
--- a/website/src/lib/docs/nl/toolbar.mdx
+++ b/website/src/lib/docs/nl/toolbar.mdx
@@ -4,7 +4,7 @@ title: Werkbalk
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/no/toolbar.mdx b/website/src/lib/docs/no/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/no/toolbar.mdx
+++ b/website/src/lib/docs/no/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/pl/toolbar.mdx b/website/src/lib/docs/pl/toolbar.mdx
index 1c2ba7ee..99071e4a 100644
--- a/website/src/lib/docs/pl/toolbar.mdx
+++ b/website/src/lib/docs/pl/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/pt-BR/toolbar.mdx b/website/src/lib/docs/pt-BR/toolbar.mdx
index 92a5aa80..e37a8d4c 100644
--- a/website/src/lib/docs/pt-BR/toolbar.mdx
+++ b/website/src/lib/docs/pt-BR/toolbar.mdx
@@ -4,7 +4,7 @@ title: Barra de ferramentas
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/pt/toolbar.mdx b/website/src/lib/docs/pt/toolbar.mdx
index 7ab29217..b25ab520 100644
--- a/website/src/lib/docs/pt/toolbar.mdx
+++ b/website/src/lib/docs/pt/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/ro/toolbar.mdx b/website/src/lib/docs/ro/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/ro/toolbar.mdx
+++ b/website/src/lib/docs/ro/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/ru/toolbar.mdx b/website/src/lib/docs/ru/toolbar.mdx
index 1d0109e7..89b469ef 100644
--- a/website/src/lib/docs/ru/toolbar.mdx
+++ b/website/src/lib/docs/ru/toolbar.mdx
@@ -4,7 +4,7 @@ title: Панель инструментов
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/sr/toolbar.mdx b/website/src/lib/docs/sr/toolbar.mdx
index 04b393ee..47ed1030 100644
--- a/website/src/lib/docs/sr/toolbar.mdx
+++ b/website/src/lib/docs/sr/toolbar.mdx
@@ -4,7 +4,7 @@ title: Traka sa alatkama
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/sv/toolbar.mdx b/website/src/lib/docs/sv/toolbar.mdx
index 220999ac..e65ea1d8 100644
--- a/website/src/lib/docs/sv/toolbar.mdx
+++ b/website/src/lib/docs/sv/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/tr/toolbar.mdx b/website/src/lib/docs/tr/toolbar.mdx
index 663d07e9..d2365979 100644
--- a/website/src/lib/docs/tr/toolbar.mdx
+++ b/website/src/lib/docs/tr/toolbar.mdx
@@ -4,7 +4,7 @@ title: Araç çubuğu
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/uk/toolbar.mdx b/website/src/lib/docs/uk/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/uk/toolbar.mdx
+++ b/website/src/lib/docs/uk/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/vi/toolbar.mdx b/website/src/lib/docs/vi/toolbar.mdx
index 86a6a980..c936cde7 100644
--- a/website/src/lib/docs/vi/toolbar.mdx
+++ b/website/src/lib/docs/vi/toolbar.mdx
@@ -4,7 +4,7 @@ title: Toolbar
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/lib/docs/zh/toolbar.mdx b/website/src/lib/docs/zh/toolbar.mdx
index ce6af938..147cde5f 100644
--- a/website/src/lib/docs/zh/toolbar.mdx
+++ b/website/src/lib/docs/zh/toolbar.mdx
@@ -4,7 +4,7 @@ title: 工具栏
 
 <script lang="ts">
     import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
-	import { currentTool, Tool } from '$lib/stores';
+	import { currentTool, Tool } from '$lib/components/toolbar/tools';
 	import { onMount, onDestroy } from 'svelte';
 
     onMount(() => {
diff --git a/website/src/routes/[[language]]/+page.svelte b/website/src/routes/[[language]]/+page.svelte
index a24c1af1..aef52256 100644
--- a/website/src/routes/[[language]]/+page.svelte
+++ b/website/src/routes/[[language]]/+page.svelte
@@ -2,9 +2,9 @@
     import { Button } from '$lib/components/ui/button';
     import DocsContainer from '$lib/components/docs/DocsContainer.svelte';
     import Logo from '$lib/components/Logo.svelte';
-    // import ElevationProfile from '$lib/components/ElevationProfile.svelte';
+    import ElevationProfile from '$lib/components/ElevationProfile.svelte';
     import GPXStatistics from '$lib/components/GPXStatistics.svelte';
-    // import Routing from '$lib/components/toolbar/tools/routing/Routing.svelte';
+    import Routing from '$lib/components/toolbar/tools/routing/Routing.svelte';
     import {
         BookOpenText,
         Heart,
@@ -19,7 +19,7 @@
     import { getURLForLanguage } from '$lib/utils';
     import { exampleGPXFile } from '$lib/assets/example';
     import { writable } from 'svelte/store';
-    // import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
+    import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
     import { currentTool, Tool } from '$lib/components/toolbar/tools';
     import { onDestroy, onMount } from 'svelte';
 
@@ -102,7 +102,7 @@
                 <p class="text-muted-foreground">{i18n._('homepage.route_planning_description')}</p>
             </div>
             <div class="p-3 w-fit rounded-md border shadow-xl md:shrink-0">
-                <!-- <Routing minimizable={false} /> -->
+                <Routing minimizable={false} />
             </div>
         </div>
     </div>
@@ -120,7 +120,7 @@
                 </p>
             </div>
             <div class="relative md:shrink-0 max-w-[400px]">
-                <!-- <Toolbar /> -->
+                <Toolbar />
             </div>
             <div class="markdown text-center hidden md:block">
                 <h1>
@@ -190,12 +190,12 @@
             </p>
         </div>
         <div class="h-48 w-full">
-            <!-- <ElevationProfile
+            <ElevationProfile
                 {gpxStatistics}
                 {slicedGPXStatistics}
                 additionalDatasets={$additionalDatasets}
                 elevationFill={$elevationFill}
-            /> -->
+            />
         </div>
         <div class="flex flex-col items-center">
             <div class="h-10 w-fit">
@@ -250,12 +250,7 @@
                 <DocsContainer module={fundingModule.default} />
             {/await}
             <Button href="https://ko-fi.com/gpxstudio" target="_blank" class="text-base">
-                <Heart
-                    size="16"
-                    class="mr-1"
-                    fill="rgb(var(--support))"
-                    color="rgb(var(--support))"
-                />
+                <Heart size="16" class="mr-1" fill="var(--support)" color="var(--support)" />
                 <span>{i18n._('homepage.support_button')}</span>
             </Button>
         </div>