New translations settings.mdx (Greek)

README.md

@@ -70,9 +70,8 @@ This project has been made possible thanks to the following open source projects
     - [SortableJS](https://github.com/SortableJS/Sortable) — creating a sortable file tree
 - Mapping:
     - [MapLibre GL JS](https://github.com/maplibre/maplibre-gl-js) — beautiful and fast interactive map rendering
-    - [GraphHopper](https://github.com/graphhopper/graphhopper) — powerful routing engine
+    - [GraphHopper](https://github.com/graphhopper/graphhopper) — routing engine
-    - [OpenStreetMap](https://www.openstreetmap.org) — open map data used by most of the map layers, and by the routing engine
+    - [OpenStreetMap](https://www.openstreetmap.org) — map data used by most of the map layers, and by the routing engine
-    - [Mapterhorn](https://github.com/mapterhorn/mapterhorn) — high-quality open terrain data used by some map layers (including for 3D), and by the routing engine
 - Search:
     - [DocSearch](https://github.com/algolia/docsearch) — search engine for the documentation
 

website/components.json

@@ -1,8 +1,9 @@
 {
     "$schema": "https://shadcn-svelte.com/schema.json",
+    "style": "default",
     "tailwind": {
         "css": "src/app.css",
-		"baseColor": "neutral"
+        "baseColor": "slate"
     },
     "aliases": {
         "components": "$lib/components",
@@ -12,9 +13,5 @@
         "lib": "$lib"
     },
     "typescript": true,
-	"registry": "https://shadcn-svelte.com/registry",
+    "registry": "https://shadcn-svelte.com/registry"
-	"style": "nova",
-	"iconLibrary": "lucide",
-	"menuColor": "default",
-	"menuAccent": "subtle"
 }

website/package.json

@@ -14,9 +14,7 @@
         "format": "prettier --write . --config ../.prettierrc --ignore-path ../.prettierignore --ignore-path ./.gitignore"
     },
     "devDependencies": {
-        "@fontsource-variable/inter": "^5.2.8",
+        "@lucide/svelte": "^0.544.0",
-        "@internationalized/date": "^3.12.0",
-        "@lucide/svelte": "^1.7.0",
         "@sveltejs/adapter-static": "^3.0.8",
         "@sveltejs/enhanced-img": "^0.6.0",
         "@sveltejs/kit": "^2.21.2",
@@ -32,8 +30,7 @@
         "@types/sortablejs": "^1.15.8",
         "@typescript-eslint/eslint-plugin": "^8.33.1",
         "@typescript-eslint/parser": "^8.33.1",
-        "bits-ui": "^2.17.2",
+        "bits-ui": "^2.14.4",
-        "clsx": "^2.1.1",
         "eslint": "^9.28.0",
         "eslint-config-prettier": "^10.1.5",
         "eslint-plugin-svelte": "^3.9.1",
@@ -46,37 +43,39 @@
         "postcss": "^8.4.47",
         "prettier": "^3.5.3",
         "prettier-plugin-svelte": "^3.4.0",
-        "shadcn-svelte": "^1.2.7",
         "svelte": "^5.33.18",
         "svelte-check": "^4.0.0",
         "svelte-dnd-action": "^0.9.65",
-        "svelte-sonner": "^1.1.0",
+        "svelte-sonner": "^1.0.5",
-        "tailwind-merge": "^3.5.0",
+        "tailwind-variants": "^3.1.1",
-        "tailwind-variants": "^3.2.2",
         "tailwindcss": "^4.1.8",
         "tslib": "^2.8.1",
         "tsx": "^4.19.1",
-        "tw-animate-css": "^1.4.0",
+        "tw-animate-css": "^1.3.4",
         "typescript": "^5.8.3",
         "vaul-svelte": "^1.0.0-next.7",
-        "vite": "^6.3.5"
+        "vite": "^6.3.5",
+        "vite-plugin-node-polyfills": "^0.23.0"
     },
     "type": "module",
     "dependencies": {
         "@docsearch/js": "^3.9.0",
+        "@internationalized/date": "^3.8.2",
         "@mapbox/sphericalmercator": "^2.0.1",
         "@mapbox/tilebelt": "^2.0.2",
         "@maplibre/maplibre-gl-geocoder": "^1.9.4",
         "chart.js": "^4.5.1",
         "chartjs-plugin-zoom": "^2.2.0",
+        "clsx": "^2.1.1",
         "dexie": "^4.0.11",
         "file-saver": "^2.0.5",
         "gpx": "file:../gpx",
         "immer": "^10.1.1",
         "jszip": "^3.10.1",
         "mapillary-js": "^4.1.2",
-        "maplibre-gl": "^6.0.0",
+        "maplibre-gl": "^5.21.1",
         "sanitize-html": "^2.17.0",
-        "sortablejs": "^1.15.6"
+        "sortablejs": "^1.15.6",
+        "tailwind-merge": "^3.3.0"
     }
 }

website/src/app.css

@@ -1,93 +1,76 @@
 @import 'tailwindcss';
 @import 'tw-animate-css';
-@import "shadcn-svelte/tailwind.css";
-@import "@fontsource-variable/inter";
 
 @custom-variant dark (&:is(.dark *));
 
 :root {
-    --background: oklch(1 0 0);
+    --background: hsl(0 0% 100%) /* <- Wrap in HSL */;
-    --foreground: oklch(0.145 0 0);
+    --foreground: hsl(240 10% 3.9%);
-    --muted: oklch(0.97 0 0);
+    --muted: hsl(240 4.8% 95.9%);
-    --muted-foreground: oklch(0.556 0 0);
+    --muted-foreground: hsl(240 3.8% 46.1%);
-    --popover: oklch(1 0 0);
+    --popover: hsl(0 0% 100%);
-    --popover-foreground: oklch(0.145 0 0);
+    --popover-foreground: hsl(240 10% 3.9%);
-    --card: oklch(1 0 0);
+    --card: hsl(0 0% 100%);
-    --card-foreground: oklch(0.145 0 0);
+    --card-foreground: hsl(240 10% 3.9%);
-    --border: oklch(0.922 0 0);
+    --border: hsl(240 5.9% 90%);
-    --input: oklch(0.922 0 0);
+    --input: hsl(240 5.9% 90%);
-    --primary: oklch(0.205 0 0);
+    --primary: hsl(240 5.9% 10%);
-    --primary-foreground: oklch(0.985 0 0);
+    --primary-foreground: hsl(0 0% 98%);
-    --secondary: oklch(0.97 0 0);
+    --secondary: hsl(240 4.8% 95.9%);
-    --secondary-foreground: oklch(0.205 0 0);
+    --secondary-foreground: hsl(240 5.9% 10%);
-    --accent: oklch(0.97 0 0);
+    --accent: hsl(240 4.8% 95.9%);
-    --accent-foreground: oklch(0.205 0 0);
+    --accent-foreground: hsl(240 5.9% 10%);
-    --destructive: oklch(0.577 0.245 27.325);
+    --destructive: hsl(0 72.2% 50.6%);
     --destructive-foreground: hsl(0 0% 98%);
-    --ring: oklch(0.708 0 0);
+    --ring: hsl(240 10% 3.9%);
-    --sidebar: oklch(0.985 0 0);
+    --sidebar: hsl(0 0% 98%);
-    --sidebar-foreground: oklch(0.145 0 0);
+    --sidebar-foreground: hsl(240 5.3% 26.1%);
-    --sidebar-primary: oklch(0.205 0 0);
+    --sidebar-primary: hsl(240 5.9% 10%);
-    --sidebar-primary-foreground: oklch(0.985 0 0);
+    --sidebar-primary-foreground: hsl(0 0% 98%);
-    --sidebar-accent: oklch(0.97 0 0);
+    --sidebar-accent: hsl(240 4.8% 95.9%);
-    --sidebar-accent-foreground: oklch(0.205 0 0);
+    --sidebar-accent-foreground: hsl(240 5.9% 10%);
-    --sidebar-border: oklch(0.922 0 0);
+    --sidebar-border: hsl(220 13% 91%);
-    --sidebar-ring: oklch(0.708 0 0);
+    --sidebar-ring: hsl(217.2 91.2% 59.8%);
 
     --support: rgb(220 15 130);
     --link: rgb(0 110 180);
     --selection: hsl(240 4.8% 93%);
 
     --radius: 0.5rem;
-
-    --chart-1: oklch(0.87 0 0);
-
-    --chart-2: oklch(0.556 0 0);
-
-    --chart-3: oklch(0.439 0 0);
-
-    --chart-4: oklch(0.371 0 0);
-
-    --chart-5: oklch(0.269 0 0);
 }
 
 .dark {
-    --background: oklch(0.145 0 0);
+    --background: hsl(240 10% 3.9%);
-    --foreground: oklch(0.985 0 0);
+    --foreground: hsl(0 0% 98%);
-    --muted: oklch(0.269 0 0);
+    --muted: hsl(240 3.7% 15.9%);
-    --muted-foreground: oklch(0.708 0 0);
+    --muted-foreground: hsl(240 5% 64.9%);
-    --popover: oklch(0.205 0 0);
+    --popover: hsl(240 10% 3.9%);
-    --popover-foreground: oklch(0.985 0 0);
+    --popover-foreground: hsl(0 0% 98%);
-    --card: oklch(0.205 0 0);
+    --card: hsl(240 10% 3.9%);
-    --card-foreground: oklch(0.985 0 0);
+    --card-foreground: hsl(0 0% 98%);
-    --border: oklch(1 0 0 / 10%);
+    --border: hsl(240 3.7% 15.9%);
-    --input: oklch(1 0 0 / 15%);
+    --input: hsl(240 3.7% 15.9%);
-    --primary: oklch(0.922 0 0);
+    --primary: hsl(0 0% 98%);
-    --primary-foreground: oklch(0.205 0 0);
+    --primary-foreground: hsl(240 5.9% 10%);
-    --secondary: oklch(0.269 0 0);
+    --secondary: hsl(240 3.7% 15.9%);
-    --secondary-foreground: oklch(0.985 0 0);
+    --secondary-foreground: hsl(0 0% 98%);
-    --accent: oklch(0.269 0 0);
+    --accent: hsl(240 3.7% 15.9%);
-    --accent-foreground: oklch(0.985 0 0);
+    --accent-foreground: hsl(0 0% 98%);
-    --destructive: oklch(0.704 0.191 22.216);
+    --destructive: hsl(0 62.8% 30.6%);
     --destructive-foreground: hsl(0 0% 98%);
-    --ring: oklch(0.556 0 0);
+    --ring: hsl(240 4.9% 83.9%);
-    --sidebar: oklch(0.205 0 0);
+    --sidebar: hsl(240 5.9% 10%);
-    --sidebar-foreground: oklch(0.985 0 0);
+    --sidebar-foreground: hsl(240 4.8% 95.9%);
-    --sidebar-primary: oklch(0.488 0.243 264.376);
+    --sidebar-primary: hsl(224.3 76.3% 48%);
-    --sidebar-primary-foreground: oklch(0.985 0 0);
+    --sidebar-primary-foreground: hsl(0 0% 100%);
-    --sidebar-accent: oklch(0.269 0 0);
+    --sidebar-accent: hsl(240 3.7% 15.9%);
-    --sidebar-accent-foreground: oklch(0.985 0 0);
+    --sidebar-accent-foreground: hsl(240 4.8% 95.9%);
-    --sidebar-border: oklch(1 0 0 / 10%);
+    --sidebar-border: hsl(240 3.7% 15.9%);
-    --sidebar-ring: oklch(0.556 0 0);
+    --sidebar-ring: hsl(217.2 91.2% 59.8%);
 
     --support: rgb(255 110 190);
     --link: rgb(80 190 255);
     --selection: hsl(240 3.7% 22%);
-    --chart-1: oklch(0.87 0 0);
-    --chart-2: oklch(0.556 0 0);
-    --chart-3: oklch(0.439 0 0);
-    --chart-4: oklch(0.371 0 0);
-    --chart-5: oklch(0.269 0 0);
 }
 
 @theme inline {
@@ -130,35 +113,14 @@
     --color-link: var(--link);
 
     --breakpoint-xs: 540px;
-
-    --font-sans: 'Inter Variable', sans-serif;
-
-    --color-chart-5: var(--chart-5);
-
-    --color-chart-4: var(--chart-4);
-
-    --color-chart-3: var(--chart-3);
-
-    --color-chart-2: var(--chart-2);
-
-    --color-chart-1: var(--chart-1);
-
-    --radius-2xl: calc(var(--radius) * 1.8);
-
-    --radius-3xl: calc(var(--radius) * 2.2);
-
-    --radius-4xl: calc(var(--radius) * 2.6);
 }
 
 @layer base {
     * {
-        @apply border-border outline-ring/50;
+        @apply border-border;
     }
 
     body {
         @apply bg-background text-foreground;
     }
-	html {
-		@apply font-sans;
-    }
 }

website/src/lib/assets/layers.ts

@@ -31,32 +31,10 @@ import bikerouterGravel from './custom/bikerouter-gravel.json';
 export const maptilerKeyPlaceHolder = 'MAPTILER_KEY';
 
 export const basemaps: { [key: string]: string | StyleSpecification } = {
-    libertyTopo: 'https://styles.gpx.studio/liberty-topo.json',
+    maptilerStreets: `https://api.maptiler.com/maps/streets-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    libertySatellite: 'https://styles.gpx.studio/liberty-satellite.json',
+    maptilerTopo: `https://api.maptiler.com/maps/topo-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    osm: 'https://styles.gpx.studio/osm.json',
+    maptilerOutdoors: `https://api.maptiler.com/maps/outdoor-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    osmTopo: 'https://styles.gpx.studio/osm-topo.json',
+    maptilerSatellite: `https://api.maptiler.com/maps/hybrid-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    esriSatellite: {
-        version: 8,
-        sources: {
-            esriSatellite: {
-                type: 'raster',
-                tiles: [
-                    'https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/WMTS/tile/1.0.0/World_Imagery/default/default028mm/{z}/{y}/{x}.jpg',
-                ],
-                tileSize: 256,
-                maxzoom: 19,
-                attribution:
-                    '© <a href="https://www.esri.com/" target="_blank">Esri</a>, Vantor, Earthstar Geographics, and the GIS User Community',
-            },
-        },
-        layers: [
-            {
-                id: 'esriSatellite',
-                type: 'raster',
-                source: 'esriSatellite',
-            },
-        ],
-    },
     openStreetMap: {
         version: 8,
         sources: {
@@ -799,11 +777,10 @@ export type LayerTreeType = { [key: string]: LayerTreeType | boolean };
 export const basemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            libertyTopo: true,
+            maptilerStreets: true,
-            libertySatellite: true,
+            maptilerTopo: true,
-            osm: true,
+            maptilerOutdoors: true,
-            osmTopo: true,
+            maptilerSatellite: true,
-            esriSatellite: true,
             openStreetMap: true,
             openTopoMap: true,
             openHikingMap: true,
@@ -936,7 +913,7 @@ export const overpassTree: LayerTreeType = {
 };
 
 // Default basemap used
-export const defaultBasemap = 'libertyTopo';
+export const defaultBasemap = 'maptilerStreets';
 
 // Default overlays used (none)
 export const defaultOverlays: LayerTreeType = {
@@ -1025,11 +1002,10 @@ export const defaultOverpassQueries: LayerTreeType = {
 export const defaultBasemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            libertyTopo: true,
+            maptilerStreets: true,
-            libertySatellite: true,
+            maptilerTopo: true,
-            osm: true,
+            maptilerOutdoors: true,
-            osmTopo: true,
+            maptilerSatellite: true,
-            esriSatellite: false,
             openStreetMap: true,
             openTopoMap: true,
             openHikingMap: true,
@@ -1168,7 +1144,7 @@ export type CustomLayer = {
     maxZoom: number;
     layerType: 'basemap' | 'overlay';
     resourceType: 'raster' | 'vector';
-    value: string | StyleSpecification;
+    value: string | maplibregl.StyleSpecification;
 };
 
 type OverpassQueryData = {
@@ -1449,7 +1425,7 @@ export const overpassQueryData: Record<string, OverpassQueryData> = {
             color: 'DarkBlue',
         },
         tags: {
-            railway: ['station', 'halt'],
+            railway: 'station',
         },
         symbol: 'Ground Transportation',
     },
@@ -1487,11 +1463,14 @@ export const overpassQueryData: Record<string, OverpassQueryData> = {
 };
 
 export const terrainSources: { [key: string]: RasterDEMSourceSpecification } = {
+    'maptiler-dem': {
+        type: 'raster-dem',
+        url: `https://api.maptiler.com/tiles/terrain-rgb-v2/tiles.json?key=${maptilerKeyPlaceHolder}`,
+    },
     mapterhorn: {
         type: 'raster-dem',
-        url: 'https://tiles.gpx.studio/mapterhorn.json',
+        url: 'https://tiles.mapterhorn.com/tilejson.json',
-        encoding: 'terrarium',
     },
 };
 
-export const defaultTerrainSource = 'mapterhorn';
+export const defaultTerrainSource = 'maptiler-dem';

website/src/lib/components/GPXStatistics.svelte

@@ -33,7 +33,7 @@
 <Card.Root
     class="h-full {orientation === 'vertical'
         ? 'min-w-40 sm:min-w-44'
-        : 'w-full h-fit my-1'} ring-0 p-0 text-sm sm:text-base bg-transparent"
+        : 'w-full h-fit my-1'} border-none shadow-none p-0 text-sm sm:text-base bg-transparent"
 >
     <Card.Content class="h-full p-0">
         <div
@@ -73,7 +73,7 @@
                     </span>
                 </Tooltip>
             {/if}
-            {#if panelHeight > 150 || (orientation === 'horizontal' && panelWidth > 620)}
+            {#if panelHeight > 160 || (orientation === 'horizontal' && panelWidth > 620)}
                 <Tooltip
                     label="{i18n._('quantities.time')} ({i18n._('quantities.moving')} / {i18n._(
                         'quantities.total'

website/src/lib/components/Help.svelte

@@ -14,12 +14,12 @@
     } = $props();
 </script>
 
-<div class="text-[13px] bg-secondary rounded border flex flex-row items-center p-2 {className}">
+<div class="text-sm bg-secondary rounded border flex flex-row items-center p-2 {className}">
     <CircleQuestionMark size="16" class="w-4 mr-2 shrink-0 grow-0" />
     <div>
         {@render children()}
         {#if link}
-            <a href={link} target="_blank" class="text-[13px] text-link hover:underline">
+            <a href={link} target="_blank" class="text-sm text-link hover:underline">
                 {i18n._('menu.more')}
             </a>
         {/if}

website/src/lib/components/Logo.svelte

@@ -8,7 +8,7 @@
         ...others
     }: {
         iconOnly?: boolean;
-        company?: 'gpx.studio' | 'github' | 'crowdin' | 'facebook' | 'reddit';
+        company?: 'gpx.studio' | 'maptiler' | 'github' | 'crowdin' | 'facebook' | 'reddit';
         [key: string]: any;
     } = $props();
 </script>
@@ -19,6 +19,12 @@
         alt="Logo of gpx.studio."
         {...others}
     />
+{:else if company === 'maptiler'}
+    <img
+        src="{base}/maptiler-logo{mode.current === 'dark' ? '-dark' : ''}.svg"
+        alt="Logo of Maptiler."
+        {...others}
+    />
 {:else if company === 'github'}
     <svg
         role="img"

website/src/lib/components/Menu.svelte

@@ -43,8 +43,6 @@
         BookOpenText,
         ChartArea,
         Maximize,
-        Maximize2,
-        Minimize2,
     } from '@lucide/svelte';
     import { map } from '$lib/components/map/map';
     import { editMetadata } from '$lib/components/file-list/metadata/utils.svelte';
@@ -72,7 +70,7 @@
     import { copied, selection } from '$lib/logic/selection';
     import { allHidden } from '$lib/logic/hidden';
     import { boundsManager } from '$lib/logic/bounds';
-    import { tick, onMount } from 'svelte';
+    import { tick } from 'svelte';
     import { allowedPastes } from '$lib/components/file-list/sortable-file-list';
 
     const {
@@ -107,23 +105,6 @@
     }
 
     let layerSettingsOpen = $state(false);
-    let fullscreen = $state(false);
-
-    function toggleFullscreen() {
-        if (!document.fullscreenElement) {
-            document.documentElement.requestFullscreen?.();
-        } else {
-            document.exitFullscreen?.();
-        }
-    }
-
-    onMount(() => {
-        const handler = () => {
-            fullscreen = document.fullscreenElement !== null;
-        };
-        document.addEventListener('fullscreenchange', handler);
-        return () => document.removeEventListener('fullscreenchange', handler);
-    });
 </script>
 
 <div class="absolute md:top-2 left-0 right-0 z-20 flex flex-row justify-center pointer-events-none">
@@ -396,16 +377,6 @@
                         {i18n._('menu.toggle_3d')}
                         <Shortcut key={i18n._('menu.right_click_drag')} />
                     </Menubar.Item>
-                    <Menubar.Separator />
-                    <Menubar.CheckboxItem checked={fullscreen} onCheckedChange={toggleFullscreen}>
-                        {#if fullscreen}
-                            <Minimize2 size="16" />
-                        {:else}
-                            <Maximize2 size="16" />
-                        {/if}
-                        {i18n._('menu.fullscreen')}
-                        <Shortcut key="F11" />
-                    </Menubar.CheckboxItem>
                 </Menubar.Content>
             </Menubar.Menu>
             <Menubar.Menu>
@@ -418,7 +389,7 @@
                 <Menubar.Content class="border-none">
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <Ruler size="16" />{i18n._('menu.distance_units')}
+                            <Ruler size="16" class="mr-2" />{i18n._('menu.distance_units')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
                             <Menubar.RadioGroup bind:value={$distanceUnits}>
@@ -436,7 +407,7 @@
                     </Menubar.Sub>
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <Zap size="16" />{i18n._('menu.velocity_units')}
+                            <Zap size="16" class="mr-2" />{i18n._('menu.velocity_units')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
                             <Menubar.RadioGroup bind:value={$velocityUnits}>
@@ -451,7 +422,7 @@
                     </Menubar.Sub>
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <Thermometer size="16" />{i18n._('menu.temperature_units')}
+                            <Thermometer size="16" class="mr-2" />{i18n._('menu.temperature_units')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
                             <Menubar.RadioGroup bind:value={$temperatureUnits}>
@@ -467,7 +438,7 @@
                     <Menubar.Separator />
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <Languages size="16" />
+                            <Languages size="16" class="mr-2" />
                             {i18n._('menu.language')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
@@ -483,9 +454,9 @@
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
                             {#if mode.current === 'light' || !mode.current}
-                                <Sun size="16" />
+                                <Sun size="16" class="mr-2" />
                             {:else}
-                                <Moon size="16" />
+                                <Moon size="16" class="mr-2" />
                             {/if}
                             {i18n._('menu.mode')}
                         </Menubar.SubTrigger>
@@ -508,7 +479,7 @@
                     <Menubar.Separator />
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <PersonStanding size="16" />
+                            <PersonStanding size="16" class="mr-2" />
                             {i18n._('menu.street_view_source')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
@@ -529,12 +500,12 @@
                 </Menubar.Content>
             </Menubar.Menu>
         </Menubar.Root>
-        <div class="h-fit flex flex-row items-center">
+        <div class="h-fit flex flex-row items-center ml-1 gap-1">
             <Button
                 variant="ghost"
                 href="./help"
                 target="_blank"
-                class="cursor-default h-fit rounded-md px-3 py-0.5"
+                class="cursor-default h-fit rounded-sm px-3 py-0.5"
                 aria-label={i18n._('menu.help')}
             >
                 <BookOpenText size="18" class="md:hidden" />
@@ -546,7 +517,7 @@
                 variant="ghost"
                 href="https://opencollective.com/gpxstudio"
                 target="_blank"
-                class="cursor-default h-fit rounded-md font-bold text-support hover:text-support px-3 py-0.5"
+                class="cursor-default h-fit rounded-sm font-bold text-support hover:text-support px-3 py-0.5"
                 aria-label={i18n._('menu.donate')}
             >
                 <HeartHandshake size="18" class="md:hidden" />

website/src/lib/components/collapsible-tree/CollapsibleTreeNode.svelte

@@ -35,7 +35,7 @@
             <Button
                 variant="ghost"
                 size="icon"
-                class="w-full flex flex-row gap-1 border-none {side === 'right'
+                class="w-full flex flex-row gap-1 {side === 'right'
                     ? 'justify-between'
                     : 'justify-start pl-1'} h-fit {nohover
                     ? 'hover:bg-background'
@@ -62,7 +62,7 @@
         <Button
             variant="ghost"
             size="icon"
-            class="w-full flex flex-row gap-1 border-none {side === 'right'
+            class="w-full flex flex-row gap-1 {side === 'right'
                 ? 'justify-between'
                 : 'justify-start pl-1'} h-fit {nohover ? 'hover:bg-background' : ''}"
         >

website/src/lib/components/docs/DocsLayers.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
-    import topoMap from '$lib/assets/img/docs/maps/topo.png?enhanced';
+    import maptilerTopoMap from '$lib/assets/img/home/maptiler-topo.png?enhanced';
-    import waymarkedMap from '$lib/assets/img/docs/maps/waymarked.png?enhanced';
+    import waymarkedMap from '$lib/assets/img/home/waymarked.png?enhanced';
 </script>
 
 <div class="relative h-80 aspect-square rounded-2xl shadow-xl overflow-clip">
-    <enhanced:img src={topoMap} alt="Topo map screenshot." class="absolute" />
+    <enhanced:img src={maptilerTopoMap} alt="MapTiler Topo map screenshot." class="absolute" />
     <enhanced:img
         src={waymarkedMap}
         alt="Waymarked Trails map screenshot."

website/src/lib/components/elevation-profile/ElevationProfile.svelte

@@ -81,18 +81,20 @@
                     </ButtonWithTooltip>
                 </Popover.Trigger>
                 <Popover.Content
-                    class="w-fit p-0 flex flex-col gap-0 overflow-hidden"
+                    class="w-fit p-0 flex flex-col"
                     side="top"
                     align="end"
                     sideOffset={-32}
                 >
                     <ToggleGroup.Root
-                        class="flex flex-col w-full border-none"
+                        class="flex flex-col items-start gap-0 p-1 w-full border-none"
                         type="single"
-                        size="sm"
                         bind:value={$elevationFill}
                     >
-                        <ToggleGroup.Item value="slope" class="w-full flex flex-row justify-start">
+                        <ToggleGroup.Item
+                            class="p-0 pr-1.5 h-6 w-full gap-1.5 rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+                            value="slope"
+                        >
                             <div class="w-6 flex justify-center items-center">
                                 {#if $elevationFill === 'slope'}
                                     <Circle class="size-1.5 fill-current text-current" />
@@ -102,8 +104,9 @@
                             {i18n._('quantities.slope')}
                         </ToggleGroup.Item>
                         <ToggleGroup.Item
+                            class="p-0 pr-1.5 h-6 w-full gap-1.5 rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
                             value="surface"
-                            class="w-full flex flex-row justify-start"
+                            variant="outline"
                         >
                             <div class="w-6 flex justify-center items-center">
                                 {#if $elevationFill === 'surface'}
@@ -114,8 +117,9 @@
                             {i18n._('quantities.surface')}
                         </ToggleGroup.Item>
                         <ToggleGroup.Item
+                            class="p-0 pr-1.5 h-6 w-full gap-1.5 rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
                             value="highway"
-                            class="w-full flex flex-row justify-start"
+                            variant="outline"
                         >
                             <div class="w-6 flex justify-center items-center">
                                 {#if $elevationFill === 'highway'}
@@ -128,12 +132,14 @@
                     </ToggleGroup.Root>
                     <Separator />
                     <ToggleGroup.Root
-                        class="flex flex-col gap-0"
+                        class="flex flex-col items-start gap-0 p-1"
                         type="multiple"
-                        size="sm"
                         bind:value={$additionalDatasets}
                     >
-                        <ToggleGroup.Item value="speed" class="w-full flex flex-row justify-start">
+                        <ToggleGroup.Item
+                            class="p-0 pr-1.5 h-6 w-full gap-1.5 rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+                            value="speed"
+                        >
                             <div class="w-6 flex justify-center items-center">
                                 {#if $additionalDatasets.includes('speed')}
                                     <Check size="14" />
@@ -144,7 +150,10 @@
                                 ? i18n._('quantities.speed')
                                 : i18n._('quantities.pace')}
                         </ToggleGroup.Item>
-                        <ToggleGroup.Item value="hr" class="w-full flex flex-row justify-start">
+                        <ToggleGroup.Item
+                            class="p-0 pr-1.5 h-6 w-full gap-1.5 rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+                            value="hr"
+                        >
                             <div class="w-6 flex justify-center items-center">
                                 {#if $additionalDatasets.includes('hr')}
                                     <Check size="14" />
@@ -153,7 +162,10 @@
                             <HeartPulse size="15" />
                             {i18n._('quantities.heartrate')}
                         </ToggleGroup.Item>
-                        <ToggleGroup.Item value="cad" class="w-full flex flex-row justify-start">
+                        <ToggleGroup.Item
+                            class="p-0 pr-1.5 h-6 w-full gap-1.5 rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+                            value="cad"
+                        >
                             <div class="w-6 flex justify-center items-center">
                                 {#if $additionalDatasets.includes('cad')}
                                     <Check size="14" />
@@ -162,7 +174,10 @@
                             <Orbit size="15" />
                             {i18n._('quantities.cadence')}
                         </ToggleGroup.Item>
-                        <ToggleGroup.Item value="atemp" class="w-full flex flex-row justify-start">
+                        <ToggleGroup.Item
+                            class="p-0 pr-1.5 h-6 w-full gap-1.5 rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+                            value="atemp"
+                        >
                             <div class="w-6 flex justify-center items-center">
                                 {#if $additionalDatasets.includes('atemp')}
                                     <Check size="14" />
@@ -171,7 +186,10 @@
                             <Thermometer size="15" />
                             {i18n._('quantities.temperature')}
                         </ToggleGroup.Item>
-                        <ToggleGroup.Item value="power" class="w-full flex flex-row justify-start">
+                        <ToggleGroup.Item
+                            class="p-0 pr-1.5 h-6 w-full gap-1.5 rounded flex justify-start data-[state=on]:bg-background data-[state=on]:hover:bg-accent hover:bg-accent hover:text-foreground"
+                            value="power"
+                        >
                             <div class="w-6 flex justify-center items-center">
                                 {#if $additionalDatasets.includes('power')}
                                     <Check size="14" />

website/src/lib/components/embedding/Embedding.svelte

@@ -21,7 +21,6 @@
     import { selection } from '$lib/logic/selection';
     import { untrack } from 'svelte';
     import { isSelected, toggle } from '$lib/components/map/layer-control/utils';
-    import { boundsManager } from '$lib/logic/bounds';
 
     let {
         useHash = true,
@@ -46,6 +45,26 @@
     settings.initialize();
 
     function applyOptions() {
+        let downloads: Promise<GPXFile | null>[] = getFilesFromEmbeddingOptions(options).map(
+            (url) => {
+                return fetch(url)
+                    .then((response) => response.blob())
+                    .then((blob) => new File([blob], url.split('/').pop() ?? url))
+                    .then(loadFile);
+            }
+        );
+        Promise.all(downloads).then((answers) => {
+            const files = answers.filter((file) => file !== null) as GPXFile[];
+            let ids: string[] = [];
+            files.forEach((file, index) => {
+                let id = `gpx-${index}-embed`;
+                file._data.id = id;
+                ids.push(id);
+            });
+            fileStateCollection.setEmbeddedFiles(files);
+            $fileOrder = ids;
+            selection.selectAll();
+        });
         if (allowedEmbeddingBasemaps.includes(options.basemap)) {
             $currentBasemap = options.basemap;
         }
@@ -71,28 +90,6 @@
             ].filter((dataset) => dataset !== null)
         );
         elevationFill.set(options.elevation.fill == 'none' ? undefined : options.elevation.fill);
-
-        let downloads: Promise<GPXFile | null>[] = getFilesFromEmbeddingOptions(options).map(
-            (url) => {
-                return fetch(url)
-                    .then((response) => response.blob())
-                    .then((blob) => new File([blob], url.split('/').pop() ?? url))
-                    .then(loadFile);
-            }
-        );
-        Promise.all(downloads).then((answers) => {
-            const files = answers.filter((file) => file !== null) as GPXFile[];
-            let ids: string[] = [];
-            files.forEach((file, index) => {
-                let id = `gpx-${index}-embed`;
-                file._data.id = id;
-                ids.push(id);
-            });
-            fileStateCollection.setEmbeddedFiles(files);
-            $fileOrder = ids;
-            selection.selectAll();
-            boundsManager.fitBoundsOnLoad(ids);
-        });
     }
 
     $effect(() => {

website/src/lib/components/embedding/embedding.ts

@@ -29,7 +29,7 @@ export const defaultEmbeddingOptions = {
     key: '',
     files: [],
     ids: [],
-    basemap: 'libertyTopo',
+    basemap: 'maptilerStreets',
     elevation: {
         show: true,
         height: 170,
@@ -126,7 +126,7 @@ export function convertOldEmbeddingOptions(options: URLSearchParams): any {
     if (options.has('source')) {
         let basemap = options.get('source')!;
         if (basemap === 'satellite') {
-            newOptions.basemap = 'libertySatellite';
+            newOptions.basemap = 'maptilerSatellite';
         } else if (basemap === 'otm') {
             newOptions.basemap = 'openTopoMap';
         } else if (basemap === 'ohm') {

website/src/lib/components/file-list/FileListNodeLabel.svelte

@@ -114,10 +114,10 @@
     <ContextMenu.Trigger class="grow truncate">
         <Button
             variant="ghost"
-            class="relative w-full p-0 overflow-hidden border-none focus-visible:ring-0 focus-visible:ring-offset-0 flex flex-row {orientation ===
+            class="relative w-full p-0 overflow-hidden focus-visible:ring-0 focus-visible:ring-offset-0 {orientation ===
             'vertical'
-                ? 'h-7'
+                ? 'h-fit'
-                : 'h-9 px-1.5'} pointer-events-auto"
+                : 'h-9 px-1.5 shadow-md'} pointer-events-auto"
         >
             {#if item instanceof ListFileItem || item instanceof ListTrackItem}
                 <MetadataDialog bind:open={openEditMetadata} {node} {item} />
@@ -126,7 +126,7 @@
             {#if item.level === ListLevel.FILE || item.level === ListLevel.TRACK}
                 <div
                     class="absolute {orientation === 'vertical'
-                        ? 'top-0 bottom-0 right-0 w-1'
+                        ? 'top-0 bottom-0 right-1 w-1'
                         : 'top-0 h-1 left-0 right-0'}"
                     style="background:linear-gradient(to {orientation === 'vertical'
                         ? 'bottom'
@@ -139,7 +139,7 @@
                 ></div>
             {/if}
             <span
-                class="grow text-left truncate ml-1 flex flex-row items-center {hidden
+                class="w-full text-left truncate py-1 flex flex-row items-center {hidden
                     ? 'text-muted-foreground'
                     : ''} {$cut && $copied?.some((i) => i.getFullId() === item.getFullId())
                     ? 'text-muted-foreground'

website/src/lib/components/map/custom-control/CustomControl.svelte

@@ -2,7 +2,6 @@
     import CustomControl from './custom-control';
     import { map } from '$lib/components/map/map';
     import { onMount, type Snippet } from 'svelte';
-    import type { Map } from 'maplibre-gl';
 
     let {
         position = 'top-right',
@@ -18,7 +17,7 @@
     let control: CustomControl | null = null;
 
     onMount(() => {
-        map.onLoad((map: Map) => {
+        map.onLoad((map: maplibregl.Map) => {
             if (position.includes('right')) container.classList.add('float-right');
             else container.classList.add('float-left');
             container.classList.remove('hidden');

website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte

@@ -16,6 +16,7 @@
 </script>
 
 <Button
+    size="sm"
     class="justify-start {className}"
     variant="outline"
     onclick={() => {

website/src/lib/components/map/gpx-layer/TrackpointPopup.svelte

@@ -39,6 +39,7 @@
         />
         {#if trackpoint.fileId === undefined}
             <Button
+                size="sm"
                 variant="outline"
                 class="justify-start"
                 href={`https://www.openstreetmap.org/edit?#map=${(($map?.getZoom() ?? 17) + 1).toFixed(0)}/${trackpoint.item.getLatitude().toFixed(5)}/${trackpoint.item.getLongitude().toFixed(5)}`}

website/src/lib/components/map/gpx-layer/WaypointPopup.svelte

@@ -88,6 +88,7 @@
             <CopyCoordinates coordinates={waypoint.item.attributes} />
             {#if $currentTool === Tool.WAYPOINT && selected}
                 <Button
+                    class="p-1 has-[>svg]:px-2 h-8"
                     variant="outline"
                     onclick={() => {
                         if (waypoint.fileId) {

website/src/lib/components/map/gpx-layer/distance-markers.ts

@@ -74,7 +74,7 @@ export class DistanceMarkers {
                             layout: {
                                 'text-field': ['get', 'distance'],
                                 'text-size': 14,
-                                'text-font': ['Noto Sans Bold'],
+                                'text-font': ['Open Sans Bold'],
                             },
                             paint: {
                                 'text-color': 'black',

website/src/lib/components/map/gpx-layer/gpx-layer-popup.ts

@@ -1,10 +1,9 @@
 import { MapPopup } from '$lib/components/map/map-popup';
-import type { Map } from 'maplibre-gl';
 
 export let waypointPopup: MapPopup | null = null;
 export let trackpointPopup: MapPopup | null = null;
 
-export function createPopups(map: Map) {
+export function createPopups(map: maplibregl.Map) {
     removePopups();
     waypointPopup = new MapPopup(map, {
         closeButton: false,

website/src/lib/components/map/gpx-layer/gpx-layer.ts

@@ -1,10 +1,9 @@
 import { get, type Readable } from 'svelte/store';
-import {
+import maplibregl, {
     type GeoJSONSource,
     type FilterSpecification,
     type MapLayerMouseEvent,
     type MapLayerTouchEvent,
-    Point,
 } from 'maplibre-gl';
 import { map } from '$lib/components/map/map';
 import { waypointPopup, trackpointPopup } from './gpx-layer-popup';
@@ -121,7 +120,7 @@ export class GPXLayer {
     selected: boolean = false;
     currentWaypointData: GeoJSON.FeatureCollection | null = null;
     draggedWaypointIndex: number | null = null;
-    draggingStartingPosition: Point = new Point(0, 0);
+    draggingStartingPosition: maplibregl.Point = new maplibregl.Point(0, 0);
     unsubscribe: Function[] = [];
 
     updateBinded: () => void = this.update.bind(this);
@@ -252,11 +251,11 @@ export class GPXLayer {
                             source: this.fileId,
                             layout: {
                                 'text-field': '»',
-                                'text-offset': [0, -0.1],
+                                'text-offset': [0, -0.06],
                                 'text-keep-upright': false,
                                 'text-max-angle': 361,
                                 'text-allow-overlap': true,
-                                'text-font': ['Noto Sans Bold'],
+                                'text-font': ['Open Sans Bold'],
                                 'symbol-placement': 'line',
                                 'symbol-spacing': 20,
                             },

website/src/lib/components/map/layer-control/CustomLayers.svelte

@@ -232,13 +232,16 @@
 
 <div class="flex flex-col">
     {#if $customBasemapOrder.length > 0}
-        <div class="px-3 py-2">
         <div class="flex flex-row items-center gap-1 font-semibold mb-2">
             <Map size="16" />
             {i18n._('layers.label.basemaps')}
+            <div class="grow">
+                <Separator />
             </div>
+        </div>
+    {/if}
     <div
-                class="ml-1.5 flex flex-col gap-1"
+        class="ml-1.5 flex flex-col gap-1 {$customBasemapOrder.length > 0 ? 'mb-2' : ''}"
         use:dndzone={{
             items: customBasemapItems,
             type: 'basemap',
@@ -255,17 +258,14 @@
         onfinalize={(e) => {
             customBasemapItems = e.detail.items;
             $customBasemapOrder = customBasemapItems.map((item) => item.id);
-                    $selectedBasemapTree.basemaps['custom'] = customBasemapItems.reduce(
+            $selectedBasemapTree.basemaps['custom'] = customBasemapItems.reduce((acc, item) => {
-                        (acc, item) => {
                 acc[item.id] = true;
                 return acc;
-                        },
+            }, {});
-                        {}
-                    );
         }}
     >
         {#each customBasemapItems as item (item.id)}
-                    <div class="flex flex-row items-center gap-1">
+            <div class="flex flex-row items-center gap-2">
                 <Move size="12" />
                 <span class="grow">{item.name}</span>
                 <Button
@@ -287,18 +287,17 @@
             </div>
         {/each}
     </div>
-        </div>
-        <Separator />
-    {/if}
     {#if $customOverlayOrder.length > 0}
-        <div class="px-3 py-2">
         <div class="flex flex-row items-center gap-1 font-semibold mb-2">
             <Layers2 size="16" />
             {i18n._('layers.label.overlays')}
-                <div class="grow"></div>
+            <div class="grow">
+                <Separator />
             </div>
+        </div>
+    {/if}
     <div
-                class="ml-1.5 flex flex-col gap-1"
+        class="ml-1.5 flex flex-col gap-1 {$customOverlayOrder.length > 0 ? 'mb-2' : ''}"
         use:dndzone={{
             items: customOverlayItems,
             type: 'overlay',
@@ -315,17 +314,14 @@
         onfinalize={(e) => {
             customOverlayItems = e.detail.items;
             $customOverlayOrder = customOverlayItems.map((item) => item.id);
-                    $selectedOverlayTree.overlays['custom'] = customOverlayItems.reduce(
+            $selectedOverlayTree.overlays['custom'] = customOverlayItems.reduce((acc, item) => {
-                        (acc, item) => {
                 acc[item.id] = true;
                 return acc;
-                        },
+            }, {});
-                        {}
-                    );
         }}
     >
         {#each customOverlayItems as item (item.id)}
-                    <div class="flex flex-row items-center gap-1">
+            <div class="flex flex-row items-center gap-2">
                 <Move size="12" />
                 <span class="grow">{item.name}</span>
                 <Button
@@ -347,12 +343,9 @@
             </div>
         {/each}
     </div>
-        </div>
+    <Card.Root class="py-0 gap-0 shadow-none">
-        <Separator />
-    {/if}
-    <Card.Root class="py-0 gap-0 shadow-none ring-0">
         <Card.Header class="p-3">
-            <Card.Title class="text-sm font-semibold">
+            <Card.Title class="text-base">
                 {#if selectedLayerId}
                     {i18n._('layers.custom_layers.edit')}
                 {:else}
@@ -360,7 +353,7 @@
                 {/if}
             </Card.Title>
         </Card.Header>
-        <Card.Content class="px-3 py-2">
+        <Card.Content class="p-3 pt-0">
             <fieldset class="flex flex-col gap-2">
                 <Label for="name">{i18n._('menu.metadata.name')}</Label>
                 <Input bind:value={name} id="name" class="h-8" />
@@ -417,7 +410,7 @@
                     </div>
                 </RadioGroup.Root>
                 {#if selectedLayerId}
-                    <div class="mt-2 flex flex-row gap-1">
+                    <div class="mt-2 flex flex-row gap-2">
                         <Button variant="outline" onclick={createLayer} class="grow">
                             <Save size="16" />
                             {i18n._('layers.custom_layers.update')}

website/src/lib/components/map/layer-control/LayerControl.svelte

@@ -7,7 +7,6 @@
     import { Layers } from '@lucide/svelte';
     import { settings } from '$lib/logic/settings';
     import { map } from '$lib/components/map/map';
-    import type { Map } from 'maplibre-gl';
 
     let container: HTMLDivElement;
     let overpassLayer: OverpassLayer;
@@ -22,7 +21,7 @@
         selectedOverpassTree,
     } = settings;
 
-    map.onLoad((_map: Map) => {
+    map.onLoad((_map: maplibregl.Map) => {
         if (overpassLayer) {
             overpassLayer.remove();
         }

website/src/lib/components/map/layer-control/LayerControlSettings.svelte

@@ -121,7 +121,7 @@
                 <Accordion.Root class="flex flex-col" bind:value={accordionValue} type="single">
                     <Accordion.Item value="layer-selection" class="flex flex-col">
                         <Accordion.Trigger>{i18n._('layers.selection')}</Accordion.Trigger>
-                        <Accordion.Content class="grow flex flex-col border rounded-md mb-1.5">
+                        <Accordion.Content class="grow flex flex-col border rounded">
                             <div class="py-2 pl-3 pr-2">
                                 <LayerTree
                                     layerTree={basemapTree}
@@ -152,9 +152,7 @@
                     </Accordion.Item>
                     <Accordion.Item value="overlay-opacity">
                         <Accordion.Trigger>{i18n._('layers.opacity')}</Accordion.Trigger>
-                        <Accordion.Content
+                        <Accordion.Content class="flex flex-col gap-3 overflow-visible">
-                            class="flex flex-col gap-3 overflow-visible border rounded-md px-3 py-2 mb-1.5"
-                        >
                             <div class="flex flex-row gap-6 items-center">
                                 <Label>
                                     {i18n._('layers.custom_layers.overlay')}
@@ -233,10 +231,10 @@
                     <Accordion.Item value="custom-layers">
                         <Accordion.Trigger>{i18n._('layers.custom_layers.title')}</Accordion.Trigger
                         >
-                        <Accordion.Content
+                        <Accordion.Content>
-                            class="flex flex-col overflow-visible border rounded-md p-0 mb-1.5"
+                            <ScrollArea>
-                        >
                                 <CustomLayers />
+                            </ScrollArea>
                         </Accordion.Content>
                     </Accordion.Item>
                     <Accordion.Item value="terrain-source">

website/src/lib/components/map/layer-control/OverpassPopup.svelte

@@ -15,9 +15,7 @@
         poi: PopupItem<any>;
     } = $props();
 
-    let tags: Record<string, string> = $derived(
+    let tags: Record<string, string> = $derived(poi ? JSON.parse(poi.item.tags) : {});
-        poi ? (typeof poi.item.tags == 'object' ? poi.item.tags : JSON.parse(poi.item.tags)) : {}
-    );
     let name = $derived.by(() => {
         if (poi) {
             if (tags.name !== undefined && tags.name !== '') {
@@ -90,14 +88,6 @@
                         <span class="font-mono">{key}</span>
                         {#if key === 'website' || key.startsWith('website:') || key.endsWith(':website') || key === 'contact:facebook' || key === 'contact:instagram' || key === 'contact:twitter'}
                             <a href={value} target="_blank" class="text-link underline">{value}</a>
-                        {:else if key === 'wikipedia' || key.startsWith('wikipedia:') || key.endsWith(':wikipedia')}
-                            <a
-                                href="https://wikipedia.org/wiki/{value}"
-                                target="_blank"
-                                class="text-link underline"
-                            >
-                                {value}
-                            </a>
                         {:else if key === 'phone' || key === 'contact:phone'}
                             <a href={'tel:' + value} class="text-link underline">{value}</a>
                         {:else if key === 'email' || key === 'contact:email'}

website/src/lib/components/map/layer-control/overpass-layer.ts

@@ -6,7 +6,7 @@ import { overpassQueryData } from '$lib/assets/layers';
 import { MapPopup } from '$lib/components/map/map-popup';
 import { settings } from '$lib/logic/settings';
 import { db } from '$lib/db';
-import type { Map as MapLibreMap, GeoJSONSource } from 'maplibre-gl';
+import type { GeoJSONSource } from 'maplibre-gl';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 import type { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
 import { loadSVGIcon } from '$lib/utils';
@@ -24,11 +24,11 @@ liveQuery(() => db.overpassdata.toArray()).subscribe((pois) => {
 });
 
 export class OverpassLayer {
-    overpassUrl = 'https://overpass.gpx.studio/api/interpreter';
+    overpassUrl = 'https://overpass.private.coffee/api/interpreter';
     minZoom = 12;
     queryZoom = 12;
     expirationTime = 7 * 24 * 3600 * 1000;
-    map: MapLibreMap;
+    map: maplibregl.Map;
     layerEventManager: MapLayerEventManager;
     popup: MapPopup;
 
@@ -40,7 +40,7 @@ export class OverpassLayer {
     updateBinded = this.update.bind(this);
     onHoverBinded = this.onHover.bind(this);
 
-    constructor(map: MapLibreMap, layerEventManager: MapLayerEventManager) {
+    constructor(map: maplibregl.Map, layerEventManager: MapLayerEventManager) {
         this.map = map;
         this.layerEventManager = layerEventManager;
         this.popup = new MapPopup(map, {

website/src/lib/components/map/map-layer-event-manager.ts

@@ -1,19 +1,10 @@
 import { fileStateCollection } from '$lib/logic/file-state';
-import {
+import maplibregl from 'maplibre-gl';
-    LngLatBounds,
-    MapMouseEvent,
-    MapTouchEvent,
-    Point,
-    type Map,
-    type MapGeoJSONFeature,
-    type MapLayerMouseEvent,
-    type MapLayerTouchEvent,
-} from 'maplibre-gl';
 
-type MapLayerMouseEventListener = (e: MapLayerMouseEvent) => void;
+type MapLayerMouseEventListener = (e: maplibregl.MapLayerMouseEvent) => void;
-type MapLayerTouchEventListener = (e: MapLayerTouchEvent) => void;
+type MapLayerTouchEventListener = (e: maplibregl.MapLayerTouchEvent) => void;
 type MapLayerListener = {
-    features: MapGeoJSONFeature[];
+    features: maplibregl.MapGeoJSONFeature[];
     mousemoves: MapLayerMouseEventListener[];
     mouseenters: MapLayerMouseEventListener[];
     mouseleaves: MapLayerMouseEventListener[];
@@ -24,10 +15,10 @@ type MapLayerListener = {
 };
 
 export class MapLayerEventManager {
-    private _map: Map;
+    private _map: maplibregl.Map;
     private _listeners: Record<string, MapLayerListener> = {};
 
-    constructor(map: Map) {
+    constructor(map: maplibregl.Map) {
         this._map = map;
         this._map.on('mousemove', this._handleMouseMove.bind(this));
         this._map.on('click', this._handleMouseClick.bind(this, 'click'));
@@ -150,8 +141,7 @@ export class MapLayerEventManager {
         }
     }
 
-    private _handleMouseMove(e: MapMouseEvent) {
+    private _handleMouseMove(e: maplibregl.MapMouseEvent) {
-        if (e.originalEvent.buttons > 0) return;
         const featuresByLayer = this._getRenderedFeaturesByLayer(e);
         Object.keys(this._listeners).forEach((layerId) => {
             const features = featuresByLayer[layerId] || [];
@@ -159,20 +149,29 @@ export class MapLayerEventManager {
             if ((features.length == 0) != (listener.features.length == 0)) {
                 if (features.length > 0) {
                     if (listener.mouseenters.length > 0) {
-                        const event = new MapMouseEvent('mouseenter', e.target, e.originalEvent, {
+                        const event = new maplibregl.MapMouseEvent(
+                            'mouseenter',
+                            e.target,
+                            e.originalEvent,
+                            {
                                 features: featuresByLayer[layerId]!,
-                        });
+                            }
+                        );
                         listener.mouseenters.forEach((l) => l(event));
                     }
                 } else {
                     if (listener.mouseleaves.length > 0) {
-                        const event = new MapMouseEvent('mouseleave', e.target, e.originalEvent);
+                        const event = new maplibregl.MapMouseEvent(
+                            'mouseleave',
+                            e.target,
+                            e.originalEvent
+                        );
                         listener.mouseleaves.forEach((l) => l(event));
                     }
                 }
             }
             if (features.length > 0 && listener.mousemoves.length > 0) {
-                const event = new MapMouseEvent('mousemove', e.target, e.originalEvent, {
+                const event = new maplibregl.MapMouseEvent('mousemove', e.target, e.originalEvent, {
                     features: featuresByLayer[layerId]!,
                 });
                 listener.mousemoves.forEach((l) => l(event));
@@ -181,39 +180,49 @@ export class MapLayerEventManager {
         });
     }
 
-    private _handleMouseClick(type: string, e: MapMouseEvent) {
+    private _handleMouseClick(type: string, e: maplibregl.MapMouseEvent) {
         const featuresByLayer = this._getRenderedFeaturesByLayer(e);
         Object.keys(this._listeners).forEach((layerId) => {
             const features = featuresByLayer[layerId] || [];
             const listener = this._listeners[layerId];
             if (features.length > 0) {
                 if (type === 'click' && listener.clicks.length > 0) {
-                    const event = new MapMouseEvent('click', e.target, e.originalEvent, {
+                    const event = new maplibregl.MapMouseEvent('click', e.target, e.originalEvent, {
                         features: features,
                     });
                     listener.clicks.forEach((l) => l(event));
                 } else if (type === 'contextmenu' && listener.contextmenus.length > 0) {
-                    const event = new MapMouseEvent('contextmenu', e.target, e.originalEvent, {
+                    const event = new maplibregl.MapMouseEvent(
+                        'contextmenu',
+                        e.target,
+                        e.originalEvent,
+                        {
                             features: features,
-                    });
+                        }
+                    );
                     listener.contextmenus.forEach((l) => l(event));
                 } else if (type === 'mousedown' && listener.mousedowns.length > 0) {
-                    const event = new MapMouseEvent('mousedown', e.target, e.originalEvent, {
+                    const event = new maplibregl.MapMouseEvent(
+                        'mousedown',
+                        e.target,
+                        e.originalEvent,
+                        {
                             features: features,
-                    });
+                        }
+                    );
                     listener.mousedowns.forEach((l) => l(event));
                 }
             }
         });
     }
 
-    private _handleTouchStart(e: MapTouchEvent) {
+    private _handleTouchStart(e: maplibregl.MapTouchEvent) {
         const featuresByLayer = this._getRenderedFeaturesByLayer(e);
         Object.keys(this._listeners).forEach((layerId) => {
             const features = featuresByLayer[layerId] || [];
             const listener = this._listeners[layerId];
             if (features.length > 0) {
-                const event: MapLayerTouchEvent = new MapTouchEvent(
+                const event: maplibregl.MapLayerTouchEvent = new maplibregl.MapTouchEvent(
                     'touchstart',
                     e.target,
                     e.originalEvent
@@ -224,15 +233,18 @@ export class MapLayerEventManager {
         });
     }
 
-    private _getBounds(point: Point) {
+    private _getBounds(point: maplibregl.Point) {
         const delta = 30;
-        return new LngLatBounds(
+        return new maplibregl.LngLatBounds(
             this._map.unproject([point.x - delta, point.y + delta]),
             this._map.unproject([point.x + delta, point.y - delta])
         );
     }
 
-    private _filterLayersIntersectingBounds(layerIds: string[], bounds: LngLatBounds): string[] {
+    private _filterLayersIntersectingBounds(
+        layerIds: string[],
+        bounds: maplibregl.LngLatBounds
+    ): string[] {
         let result = layerIds.filter((layerId) => {
             if (!this._map.getLayer(layerId)) return false;
             const fileId = layerId.replace('-waypoints', '');
@@ -248,7 +260,7 @@ export class MapLayerEventManager {
         return result;
     }
 
-    private _getRenderedFeaturesByLayer(e: MapMouseEvent | MapTouchEvent) {
+    private _getRenderedFeaturesByLayer(e: maplibregl.MapMouseEvent | maplibregl.MapTouchEvent) {
         const layerIds = this._filterLayersIntersectingBounds(
             Object.keys(this._listeners),
             this._getBounds(e.point)
@@ -257,7 +269,7 @@ export class MapLayerEventManager {
             layerIds.length > 0
                 ? this._map.queryRenderedFeatures(e.point, { layers: layerIds })
                 : [];
-        const featuresByLayer: Record<string, MapGeoJSONFeature[]> = {};
+        const featuresByLayer: Record<string, maplibregl.MapGeoJSONFeature[]> = {};
         features.forEach((f) => {
             if (!featuresByLayer[f.layer.id]) {
                 featuresByLayer[f.layer.id] = [];

website/src/lib/components/map/map-popup.ts

@@ -1,5 +1,5 @@
 import { TrackPoint, Waypoint } from 'gpx';
-import { LngLat, Map, MapMouseEvent, Popup, type PopupOptions } from 'maplibre-gl';
+import maplibregl from 'maplibre-gl';
 import { mount, tick, unmount } from 'svelte';
 import { get, writable, type Writable } from 'svelte/store';
 import MapPopupComponent from '$lib/components/map/MapPopup.svelte';
@@ -11,15 +11,15 @@ export type PopupItem<T = Waypoint | TrackPoint | any> = {
 };
 
 export class MapPopup {
-    map: Map;
+    map: maplibregl.Map;
-    popup: Popup;
+    popup: maplibregl.Popup;
     item: Writable<PopupItem | null> = writable(null);
     component: ReturnType<typeof mount>;
     maybeHideBinded = this.maybeHide.bind(this);
 
-    constructor(map: Map, options?: PopupOptions) {
+    constructor(map: maplibregl.Map, options?: maplibregl.PopupOptions) {
         this.map = map;
-        this.popup = new Popup(options);
+        this.popup = new maplibregl.Popup(options);
         this.component = mount(MapPopupComponent, {
             target: document.body,
             props: {
@@ -51,7 +51,7 @@ export class MapPopup {
         this.map.on('mousemove', this.maybeHideBinded);
     }
 
-    maybeHide(e: MapMouseEvent) {
+    maybeHide(e: maplibregl.MapMouseEvent) {
         const item = get(this.item);
         if (item === null) {
             this.hide();
@@ -75,10 +75,10 @@ export class MapPopup {
     getCoordinates() {
         const item = get(this.item);
         if (item === null) {
-            return new LngLat(0, 0);
+            return new maplibregl.LngLat(0, 0);
         }
         return item.item instanceof Waypoint || item.item instanceof TrackPoint
             ? item.item.getCoordinates()
-            : new LngLat(item.item.lon, item.item.lat);
+            : new maplibregl.LngLat(item.item.lon, item.item.lat);
     }
 }

website/src/lib/components/map/map.ts

@@ -1,6 +1,5 @@
-import * as maplibregl from 'maplibre-gl';
+import maplibregl from 'maplibre-gl';
 import 'maplibre-gl/dist/maplibre-gl.css';
-import workerUrl from 'maplibre-gl/dist/maplibre-gl-worker.mjs?worker&url';
 import MaplibreGeocoder, {
     type MaplibreGeocoderFeatureResults,
 } from '@maplibre/maplibre-gl-geocoder';
@@ -40,7 +39,6 @@ export class MapLibreGLMap {
         geocoder: boolean,
         geolocate: boolean
     ) {
-        maplibregl.setWorkerUrl(workerUrl);
         this._maptilerKey = maptilerKey;
         this._styleManager = new StyleManager(this._mapStore, this._maptilerKey);
         const map = new maplibregl.Map({

website/src/lib/components/map/street-view-control/StreetViewControl.svelte

@@ -9,7 +9,6 @@
     import { i18n } from '$lib/i18n.svelte';
     import { onMount } from 'svelte';
     import ButtonWithTooltip from '$lib/components/ButtonWithTooltip.svelte';
-    import type { Map } from 'maplibre-gl';
 
     const { streetViewSource } = settings;
 
@@ -21,7 +20,7 @@
     let container: HTMLElement;
 
     onMount(() => {
-        map.onLoad((map_: Map) => {
+        map.onLoad((map_: maplibregl.Map) => {
             googleRedirect = new GoogleRedirect(map_);
             mapillaryLayer = new MapillaryLayer(
                 map_,
@@ -54,7 +53,7 @@
 <CustomControl class="w-[29px] h-[29px] shrink-0">
     <ButtonWithTooltip
         variant="ghost"
-        class="w-full h-full border-none rounded-sm"
+        class="w-full h-full"
         side="left"
         label={i18n._('menu.toggle_street_view')}
         onclick={() => {

website/src/lib/components/map/street-view-control/google.ts

@@ -1,11 +1,10 @@
 import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
-import type { Map, MapMouseEvent } from 'maplibre-gl';
 
 export class GoogleRedirect {
-    map: Map;
+    map: maplibregl.Map;
     enabled = false;
 
-    constructor(map: Map) {
+    constructor(map: maplibregl.Map) {
         this.map = map;
     }
 
@@ -25,7 +24,7 @@ export class GoogleRedirect {
         this.map.off('click', this.openStreetView);
     }
 
-    openStreetView(e: MapMouseEvent) {
+    openStreetView(e: maplibregl.MapMouseEvent) {
         window.open(
             `https://www.google.com/maps/@?api=1&map_action=pano&viewpoint=${e.lngLat.lat},${e.lngLat.lng}`
         );

website/src/lib/components/map/street-view-control/mapillary.ts

@@ -1,10 +1,4 @@
-import {
+import maplibregl, { type LayerSpecification, type VectorSourceSpecification } from 'maplibre-gl';
-    Map,
-    Marker,
-    type LayerSpecification,
-    type MapLayerMouseEvent,
-    type VectorSourceSpecification,
-} from 'maplibre-gl';
 import { Viewer, type ViewerBearingEvent } from 'mapillary-js/dist/mapillary.module';
 import 'mapillary-js/dist/mapillary.css';
 import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
@@ -49,9 +43,9 @@ const mapillaryImageLayer: LayerSpecification = {
 };
 
 export class MapillaryLayer {
-    map: Map;
+    map: maplibregl.Map;
     layerEventManager: MapLayerEventManager;
-    marker: Marker;
+    marker: maplibregl.Marker;
     viewer: Viewer;
 
     active = false;
@@ -62,7 +56,7 @@ export class MapillaryLayer {
     onMouseLeaveBinded = this.onMouseLeave.bind(this);
 
     constructor(
-        map: Map,
+        map: maplibregl.Map,
         layerEventManager: MapLayerEventManager,
         container: HTMLElement,
         popupOpen: { value: boolean }
@@ -81,7 +75,7 @@ export class MapillaryLayer {
         dot.className = 'maplibregl-user-location-dot';
         element.appendChild(dot);
 
-        this.marker = new Marker({
+        this.marker = new maplibregl.Marker({
             rotationAlignment: 'map',
             element,
         });
@@ -146,7 +140,7 @@ export class MapillaryLayer {
         this.popupOpen.value = false;
     }
 
-    onMouseEnter(e: MapLayerMouseEvent) {
+    onMouseEnter(e: maplibregl.MapLayerMouseEvent) {
         if (
             e.features &&
             e.features.length > 0 &&

website/src/lib/components/map/style.ts

@@ -9,17 +9,10 @@ import {
 } from '$lib/assets/layers';
 import { getLayers } from '$lib/components/map/layer-control/utils';
 import { i18n } from '$lib/i18n.svelte';
-import type {
-    Map,
-    GeoJSONSourceSpecification,
-    LayerSpecification,
-    StyleSpecification,
-} from 'maplibre-gl';
 
-const { currentBasemap, currentOverlays, customLayers, opacities, terrainSource, distanceUnits } =
+const { currentBasemap, currentOverlays, customLayers, opacities, terrainSource } = settings;
-    settings;
 
-const emptySource: GeoJSONSourceSpecification = {
+const emptySource: maplibregl.GeoJSONSourceSpecification = {
     type: 'geojson',
     data: {
         type: 'FeatureCollection',
@@ -38,18 +31,18 @@ export const ANCHOR_LAYER_KEY = {
     waypoints: 'waypoints-end',
     routingControls: 'routing-controls-end',
 };
-const anchorLayers: LayerSpecification[] = Object.values(ANCHOR_LAYER_KEY).map((id) => ({
+const anchorLayers: maplibregl.LayerSpecification[] = Object.values(ANCHOR_LAYER_KEY).map((id) => ({
     id: id,
     type: 'symbol',
     source: 'empty-source',
 }));
 
 export class StyleManager {
-    private _map: Writable<Map | null>;
+    private _map: Writable<maplibregl.Map | null>;
     private _maptilerKey: string;
     private _pastOverlays: Set<string> = new Set();
 
-    constructor(map: Writable<Map | null>, maptilerKey: string) {
+    constructor(map: Writable<maplibregl.Map | null>, maptilerKey: string) {
         this._map = map;
         this._maptilerKey = maptilerKey;
         this._map.subscribe((map_) => {
@@ -64,28 +57,18 @@ export class StyleManager {
         opacities.subscribe(() => this.updateOverlays());
         terrainSource.subscribe(() => this.updateTerrain());
         customLayers.subscribe(() => this.updateBasemap());
-        i18n.subscribe(() => this.updateBasemap());
-        distanceUnits.subscribe(() => {
-            const map = get(this._map);
-            if (map && (map.getLayer('contours_m') || map.getLayer('contours_ft'))) {
-                this.updateBasemap();
-            }
-        });
     }
 
     updateBasemap() {
         const map_ = get(this._map);
         if (!map_) return;
-        let basemap = get(currentBasemap);
+        this.buildStyle().then((style) => map_.setStyle(style));
-        this.buildStyle(basemap).then((style) => {
-            if (get(currentBasemap) === basemap) map_.setStyle(style);
-        });
     }
 
-    async buildStyle(basemap: string): Promise<StyleSpecification> {
+    async buildStyle(): Promise<maplibregl.StyleSpecification> {
         const custom = get(customLayers);
 
-        const style: StyleSpecification = {
+        const style: maplibregl.StyleSpecification = {
             version: 8,
             projection: {
                 type: 'globe',
@@ -96,31 +79,17 @@ export class StyleManager {
             layers: [],
         };
 
+        let basemap = get(currentBasemap);
         const basemapInfo = basemaps[basemap] ?? custom[basemap]?.value ?? basemaps[defaultBasemap];
+        const basemapStyle = await this.get(basemapInfo);
 
-        let basemapStyle = basemaps.openStreetMap as StyleSpecification;
-        try {
-            basemapStyle = await this.get(basemapInfo);
-            for (const source in basemapStyle.sources) {
-                const src = basemapStyle.sources[source];
-                if (
-                    src &&
-                    typeof src === 'object' &&
-                    'url' in src &&
-                    typeof src.url === 'string' &&
-                    src.url.includes(maptilerKeyPlaceHolder)
-                ) {
-                    src.url = src.url.replace(maptilerKeyPlaceHolder, this._maptilerKey);
-                }
-            }
-        } catch (e) {
-            console.error(e.message);
-        }
         this.merge(style, basemapStyle);
 
+        if (this._maptilerKey !== '') {
             const terrain = this.getCurrentTerrain();
             style.sources[terrain.source] = terrainSources[terrain.source];
             style.terrain = terrain.exaggeration > 0 ? terrain : undefined;
+        }
 
         style.layers.push(...anchorLayers);
 
@@ -140,21 +109,16 @@ export class StyleManager {
                 if (!layers[overlay]) {
                     if (this._pastOverlays.has(overlay)) {
                         const overlayInfo = custom[overlay]?.value ?? overlays[overlay];
-                        try {
                         const overlayStyle = await this.get(overlayInfo);
                         for (let layer of overlayStyle.layers ?? []) {
                             if (map_.getLayer(layer.id)) {
                                 map_.removeLayer(layer.id);
                             }
                         }
-                        } catch (e) {
-                            // Should not happen
-                        }
                         this._pastOverlays.delete(overlay);
                     }
                 } else {
                     const overlayInfo = custom[overlay]?.value ?? overlays[overlay];
-                    try {
                     const overlayStyle = await this.get(overlayInfo);
                     const opacity = overlayOpacities[overlay];
 
@@ -182,16 +146,15 @@ export class StyleManager {
                             map_.addLayer(layer, ANCHOR_LAYER_KEY.overlays);
                         }
                     }
+
                     this._pastOverlays.add(overlay);
-                    } catch (e) {
-                        console.error(e.message);
-                    }
                 }
             }
         } catch (e) {}
     }
 
     updateTerrain() {
+        if (this._maptilerKey === '') return;
         const map_ = get(this._map);
         if (!map_) return;
 
@@ -209,13 +172,15 @@ export class StyleManager {
         }
     }
 
-    async get(styleInfo: StyleSpecification | string): Promise<StyleSpecification> {
+    async get(
+        styleInfo: maplibregl.StyleSpecification | string
+    ): Promise<maplibregl.StyleSpecification> {
         if (typeof styleInfo === 'string') {
             let styleUrl = styleInfo as string;
-            const response = await fetch(styleUrl, { cache: 'force-cache' });
+            if (styleUrl.includes(maptilerKeyPlaceHolder)) {
-            if (!response.ok) {
+                styleUrl = styleUrl.replace(maptilerKeyPlaceHolder, this._maptilerKey);
-                throw new Error(`HTTP error fetching style "${styleInfo}": ${response.status}`);
             }
+            const response = await fetch(styleUrl, { cache: 'force-cache' });
             const style = await response.json();
             return style;
         } else {
@@ -223,42 +188,20 @@ export class StyleManager {
         }
     }
 
-    merge(style: StyleSpecification, other: StyleSpecification) {
+    merge(style: maplibregl.StyleSpecification, other: maplibregl.StyleSpecification) {
         style.sources = { ...style.sources, ...other.sources };
-        const units = get(distanceUnits);
         for (let layer of other.layers ?? []) {
-            if ('source' in layer) {
-                if (layer.source == 'contours_m' && units === 'imperial') continue;
-                if (layer.source == 'contours_ft' && units !== 'imperial') continue;
-            }
             if (layer.type === 'symbol' && layer.layout && layer.layout['text-field']) {
                 const textField = layer.layout['text-field'];
-                if (Array.isArray(textField)) {
                 if (
-                        textField.length == 4 &&
+                    Array.isArray(textField) &&
-                        Array.isArray(textField[3]) &&
+                    textField.length >= 2 &&
-                        textField[3][0] === 'coalesce' &&
-                        Array.isArray(textField[3][1]) &&
-                        textField[3][1][0] === 'get' &&
-                        typeof textField[3][1][1] === 'string' &&
-                        textField[3][1][1].startsWith('name')
-                    ) {
-                        // OpenFreeMap styles
-                        layer.layout['text-field'] = [
-                            'coalesce',
-                            ['get', `name:${i18n.lang}`],
-                            ['get', 'name'],
-                        ];
-                    }
-                    if (
-                        textField.length == 3 &&
                     textField[0] === 'coalesce' &&
                     Array.isArray(textField[1]) &&
                     textField[1][0] === 'get' &&
                     typeof textField[1][1] === 'string' &&
                     textField[1][1].startsWith('name')
                 ) {
-                        // OpenMapTiles styles
                     layer.layout['text-field'] = [
                         'coalesce',
                         ['get', `name:${i18n.lang}`],
@@ -266,7 +209,6 @@ export class StyleManager {
                     ];
                 }
             }
-            }
             style.layers.push(layer);
         }
         if (other.sprite && !style.sprite) {
@@ -279,6 +221,10 @@ export class StyleManager {
 
     getCurrentTerrain() {
         const terrain = get(terrainSource);
+        const source = terrainSources[terrain];
+        if (source.url && source.url.includes(maptilerKeyPlaceHolder)) {
+            source.url = source.url.replace(maptilerKeyPlaceHolder, this._maptilerKey);
+        }
         const map_ = get(this._map);
         return {
             source: terrain,

website/src/lib/components/toolbar/ToolbarItemMenu.svelte

@@ -11,7 +11,7 @@
     import Clean from '$lib/components/toolbar/tools/Clean.svelte';
     import Reduce from '$lib/components/toolbar/tools/reduce/Reduce.svelte';
     import RoutingControlPopup from '$lib/components/toolbar/tools/routing/RoutingControlPopup.svelte';
-    import { Popup } from 'maplibre-gl';
+    import maplibregl from 'maplibre-gl';
     import { settings } from '$lib/logic/settings';
 
     let {
@@ -23,11 +23,11 @@
     const { minimizeRoutingMenu } = settings;
 
     let popupElement: HTMLDivElement | undefined = $state(undefined);
-    let popup: Popup | undefined = $derived.by(() => {
+    let popup: maplibregl.Popup | undefined = $derived.by(() => {
         if (!popupElement) {
             return undefined;
         }
-        let popup = new Popup({
+        let popup = new maplibregl.Popup({
             closeButton: false,
             maxWidth: undefined,
         });

website/src/lib/components/toolbar/tools/Clean.svelte

@@ -16,7 +16,7 @@
     import { getURLForLanguage } from '$lib/utils';
     import { Trash2 } from '@lucide/svelte';
     import { map } from '$lib/components/map/map';
-    import type { GeoJSONSource, LngLat } from 'maplibre-gl';
+    import type { GeoJSONSource } from 'maplibre-gl';
     import { selection } from '$lib/logic/selection';
     import { fileActions } from '$lib/logic/file-actions';
     import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
@@ -29,7 +29,7 @@
     let cleanType = $state(CleanType.INSIDE);
     let deleteTrackpoints = $state(true);
     let deleteWaypoints = $state(true);
-    let rectangleCoordinates: LngLat[] = $state([]);
+    let rectangleCoordinates: maplibregl.LngLat[] = $state([]);
 
     $effect(() => {
         if ($map) {

website/src/lib/components/toolbar/tools/Elevation.svelte

@@ -17,7 +17,7 @@
 <div class="flex flex-col gap-3 w-full max-w-80 {props.class ?? ''}">
     <Button
         variant="outline"
-        class="whitespace-normal h-fit min-h-8 py-1"
+        class="whitespace-normal h-fit"
         disabled={!validSelection}
         onclick={() => fileActions.addElevationToSelection()}
     >

website/src/lib/components/toolbar/tools/Merge.svelte

@@ -76,7 +76,7 @@
     {/if}
     <Button
         variant="outline"
-        class="whitespace-normal h-fit min-h-8 py-1"
+        class="whitespace-normal h-fit"
         disabled={(mergeType === MergeType.TRACES && !canMergeTraces) ||
             (mergeType === MergeType.CONTENTS && !canMergeContents)}
         onclick={() => {

website/src/lib/components/toolbar/tools/Time.svelte

@@ -185,8 +185,8 @@
 
 <div class="flex flex-col gap-3 w-full max-w-80 {props.class ?? ''}">
     <fieldset class="flex flex-col gap-2">
-        <div class="flex flex-row gap-1.5 justify-center">
+        <div class="flex flex-row gap-2 justify-center">
-            <div class="flex flex-col gap-1 grow">
+            <div class="flex flex-col gap-2 grow">
                 <Label for="speed" class="flex flex-row">
                     <Zap size="16" />
                     {#if $velocityUnits === 'speed'}
@@ -239,7 +239,7 @@
                     {/if}
                 </div>
             </div>
-            <div class="flex flex-col gap-1 grow">
+            <div class="flex flex-col gap-2 grow">
                 <Label for="duration" class="flex flex-row">
                     <Timer size="16" />
                     {i18n._('toolbar.time.total_time')}
@@ -253,12 +253,11 @@
                 />
             </div>
         </div>
-        <div class="flex flex-col gap-1">
         <Label class="flex flex-row">
             <CirclePlay size="16" />
             {i18n._('toolbar.time.start')}
         </Label>
-            <div class="flex flex-row gap-1.5">
+        <div class="flex flex-row gap-2">
             <DatePicker
                 bind:value={startDate}
                 disabled={!canUpdate}
@@ -280,13 +279,11 @@
                 }}
             />
         </div>
-        </div>
-        <div class="flex flex-col gap-1">
         <Label class="flex flex-row">
             <CircleStop size="16" />
             {i18n._('toolbar.time.end')}
         </Label>
-            <div class="flex flex-row gap-1.5">
+        <div class="flex flex-row gap-2">
             <DatePicker
                 bind:value={endDate}
                 disabled={!canUpdate}
@@ -308,7 +305,6 @@
                 }}
             />
         </div>
-        </div>
         {#if $gpxStatistics.global.time.moving === 0 || $gpxStatistics.global.time.moving === undefined}
             <div class="mt-0.5 flex flex-row gap-1 items-center">
                 <Checkbox id="artificial-time" bind:checked={artificial} disabled={!canUpdate} />
@@ -318,11 +314,11 @@
             </div>
         {/if}
     </fieldset>
-    <div class="flex flex-row gap-1.5 items-center">
+    <div class="flex flex-row gap-2 items-center">
         <Button
             variant="outline"
             disabled={!canUpdate}
-            class="grow shrink whitespace-normal h-fit min-h-8 py-1"
+            class="grow whitespace-normal h-fit"
             onclick={() => {
                 let effectiveSpeed = getSpeed();
                 if (

website/src/lib/components/toolbar/tools/reduce/Reduce.svelte

@@ -14,7 +14,7 @@
 
     let props: { class?: string } = $props();
 
-    let sliderValue = $state(50);
+    let sliderValue = $state([50]);
     const maxTolerance = 10000;
 
     let validSelection = $derived(
@@ -25,7 +25,7 @@
 
     $effect(() => {
         tolerance.set(
-            minTolerance * 2 ** (sliderValue / (100 / Math.log2(maxTolerance / minTolerance)))
+            minTolerance * 2 ** (sliderValue[0] / (100 / Math.log2(maxTolerance / minTolerance)))
         );
     });
 
@@ -36,7 +36,7 @@
 
 <div class="flex flex-col gap-3 w-full max-w-80 {props.class ?? ''}">
     <div class="p-2">
-        <Slider bind:value={sliderValue} min={0} max={100} step={1} type="single" />
+        <Slider bind:value={sliderValue} min={0} max={100} step={1} type="multiple" />
     </div>
     <Label class="flex flex-row justify-between">
         <span>{i18n._('toolbar.reduce.tolerance')}</span>

website/src/lib/components/toolbar/tools/reduce/utils.svelte.ts

@@ -163,9 +163,6 @@ export class ReducedGPXLayerCollection {
     reduce() {
         let itemsAndPoints = new Map<ListItem, TrackPoint[]>();
         this._simplified.forEach(([item, maxPts, points], itemFullId) => {
-            if (!get(selection).hasAnyParent(item)) {
-                return;
-            }
             itemsAndPoints.set(
                 item,
                 points

website/src/lib/components/toolbar/tools/routing/Routing.svelte

@@ -41,7 +41,6 @@
     import { fileActions, getFileIds, newGPXFile } from '$lib/logic/file-actions';
     import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
     import { RoutingControls, routingControls } from './routing-controls';
-    import type { Popup } from 'maplibre-gl';
 
     let {
         minimized = $bindable(false),
@@ -52,7 +51,7 @@
     }: {
         minimized?: boolean;
         minimizable?: boolean;
-        popup?: Popup;
+        popup?: maplibregl.Popup;
         popupElement?: HTMLDivElement;
         class?: string;
     } = $props();
@@ -192,7 +191,7 @@
             <ButtonWithTooltip
                 label={i18n._('toolbar.routing.reverse.tooltip')}
                 variant="outline"
-                class="gap-1 text-xs px-1.5 py-1.5 h-fit"
+                class="gap-1 text-xs"
                 disabled={!validSelection}
                 onclick={fileActions.reverseSelection}
             >
@@ -201,7 +200,7 @@
             <ButtonWithTooltip
                 label={i18n._('toolbar.routing.route_back_to_start.tooltip')}
                 variant="outline"
-                class="gap-1 text-xs px-1.5 py-1.5 h-fit"
+                class="gap-1 text-xs"
                 disabled={!validSelection}
                 onclick={() => {
                     const selected = selection.getOrderedSelection();
@@ -237,14 +236,14 @@
             <ButtonWithTooltip
                 label={i18n._('toolbar.routing.round_trip.tooltip')}
                 variant="outline"
-                class="gap-1 text-xs px-1.5 py-1.5 h-fit"
+                class="gap-1 text-xs"
                 disabled={!validSelection}
                 onclick={fileActions.createRoundTripForSelection}
             >
                 <Repeat class="size-3" />{i18n._('toolbar.routing.round_trip.button')}
             </ButtonWithTooltip>
         </div>
-        <div class="w-full flex flex-row gap-1 items-end justify-between">
+        <div class="w-full flex flex-row gap-2 items-end justify-between">
             <Help link={getURLForLanguage(i18n.lang, '/help/toolbar/routing')}>
                 {#if !validSelection}
                     {i18n._('toolbar.routing.help_no_file')}

website/src/lib/components/toolbar/tools/routing/routing-controls.ts

@@ -1,12 +1,10 @@
 import { distance, type Coordinates, TrackPoint, TrackSegment, Track, projectedPoint } from 'gpx';
 import { get, writable, type Readable } from 'svelte/store';
-import {
+import maplibregl, {
     type MapMouseEvent,
     type GeoJSONSource,
     type MapLayerMouseEvent,
     type MapLayerTouchEvent,
-    Popup,
-    Point,
 } from 'maplibre-gl';
 import { route } from './routing';
 import { toast } from 'svelte-sonner';
@@ -52,18 +50,16 @@ export class RoutingControls {
         }
     > = new Map();
     anchors: GeoJSON.Feature<GeoJSON.Point, AnchorProperties>[] = [];
-    popup: Popup;
+    popup: maplibregl.Popup;
     popupElement: HTMLElement;
     fileUnsubscribe: () => void = () => {};
     unsubscribes: Function[] = [];
 
     updateControlsBinded: () => void = this.updateControls.bind(this);
     appendAnchorBinded: (e: MapMouseEvent) => void = this.appendAnchor.bind(this);
-    addIntermediateAnchorBinded: (e: MapMouseEvent) => void = this.addIntermediateAnchor.bind(this);
 
     draggedAnchorIndex: number | null = null;
-    lastDraggedAnchorEventTime: number = 0;
+    draggingStartingPosition: maplibregl.Point = new maplibregl.Point(0, 0);
-    draggingStartingPosition: Point = new Point(0, 0);
     onMouseEnterBinded: () => void = this.onMouseEnter.bind(this);
     onMouseLeaveBinded: () => void = this.onMouseLeave.bind(this);
     onClickBinded: (e: MapLayerMouseEvent) => void = this.onClick.bind(this);
@@ -82,14 +78,14 @@ export class RoutingControls {
     constructor(
         fileId: string,
         file: Readable<GPXFileWithStatistics | undefined>,
-        popup: Popup,
+        popup: maplibregl.Popup,
         popupElement: HTMLElement
     ) {
         this.fileId = fileId;
         this.file = file;
         for (let zoom = MIN_ANCHOR_ZOOM; zoom <= MAX_ANCHOR_ZOOM; zoom++) {
             this.layers.set(zoom, {
-                id: `routing-controls-${this.fileId}-${zoom}`,
+                id: `routing-controls-${zoom}`,
                 anchors: [],
             });
         }
@@ -137,7 +133,6 @@ export class RoutingControls {
         map_.on('style.load', this.updateControlsBinded);
         map_.on('click', this.appendAnchorBinded);
         layerEventManager.on('mousemove', this.fileId, this.showTemporaryAnchorBinded);
-        layerEventManager.on('click', this.fileId, this.addIntermediateAnchorBinded);
 
         this.fileUnsubscribe = this.file.subscribe(this.updateControlsBinded);
     }
@@ -185,7 +180,7 @@ export class RoutingControls {
 
         this.layers.forEach((layer, zoom) => {
             try {
-                let source = map_.getSource(layer.id) as GeoJSONSource | undefined;
+                let source = map_.getSource(layer.id) as maplibregl.GeoJSONSource | undefined;
                 if (source) {
                     source.setData({
                         type: 'FeatureCollection',
@@ -242,7 +237,6 @@ export class RoutingControls {
         map_?.off('style.load', this.updateControlsBinded);
         map_?.off('click', this.appendAnchorBinded);
         layerEventManager?.off('mousemove', this.fileId, this.showTemporaryAnchorBinded);
-        layerEventManager?.off('click', this.fileId, this.addIntermediateAnchorBinded);
         map_?.off('mousemove', this.updateTemporaryAnchorBinded);
 
         this.layers.forEach((layer) => {
@@ -522,24 +516,20 @@ export class RoutingControls {
         });
     }
 
-    async appendAnchor(e: MapMouseEvent) {
+    async appendAnchor(e: maplibregl.MapMouseEvent) {
         // Add a new anchor to the end of the last segment
         if (get(streetViewEnabled) && get(streetViewSource) === 'google') {
             return;
         }
-        if (
-            this.draggedAnchorIndex !== null ||
-            Date.now() - this.lastDraggedAnchorEventTime < 100
-        ) {
-            // Exit if anchor is being dragged
-            return;
-        }
         if (
             e.target.queryRenderedFeatures(e.point, {
-                layers: [this.fileId, ...[...this.layers.values()].map((layer) => layer.id)],
+                layers: this.layers
+                    .values()
+                    .map((layer) => layer.id)
+                    .toArray(),
             }).length
         ) {
-            // Clicked on routing control or layer, ignoring
+            // Clicked on routing control, ignoring
             return;
         }
         this.appendAnchorWithCoordinates({
@@ -611,15 +601,6 @@ export class RoutingControls {
         await this.routeBetweenAnchors([lastAnchor, newAnchor], [lastAnchorPoint, newAnchorPoint]);
     }
 
-    addIntermediateAnchor(e: MapMouseEvent) {
-        e.preventDefault();
-
-        if (this.temporaryAnchor !== null) {
-            this.turnIntoPermanentAnchor();
-            return;
-        }
-    }
-
     getNeighbouringAnchors(anchor: Anchor): [Anchor | null, Anchor | null] {
         let previousAnchor: Anchor | null = null;
         let nextAnchor: Anchor | null = null;
@@ -822,7 +803,7 @@ export class RoutingControls {
             `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                 <circle cx="10" cy="10" r="8" fill="white" stroke="black" stroke-width="2" />
             </svg>`,
-            _map.getCanvasContainer().offsetWidth > 1000 ? 56 : 80
+            _map.getCanvasContainer().offsetWidth > 1000 ? 50 : 80
         );
     }
 
@@ -840,11 +821,8 @@ export class RoutingControls {
     onClick(e: MapLayerMouseEvent) {
         e.preventDefault();
 
-        if (
+        if (this.temporaryAnchor !== null) {
-            this.draggedAnchorIndex !== null ||
+            this.turnIntoPermanentAnchor();
-            Date.now() - this.lastDraggedAnchorEventTime < 100
-        ) {
-            // Exit if anchor is being dragged
             return;
         }
 
@@ -933,8 +911,6 @@ export class RoutingControls {
             lat: e.lngLat.lat,
             lon: e.lngLat.lng,
         });
-
-        this.lastDraggedAnchorEventTime = Date.now();
     }
 
     onMouseUp(e: MapLayerMouseEvent | MapLayerTouchEvent) {
@@ -973,7 +949,6 @@ export class RoutingControls {
         }
 
         this.draggedAnchorIndex = null;
-        this.lastDraggedAnchorEventTime = Date.now();
     }
 
     showTemporaryAnchor(e: MapLayerMouseEvent) {
@@ -1101,9 +1076,7 @@ export class RoutingControls {
         if (!this.temporaryAnchor) {
             return;
         }
-        let source = get(map)?.getSource(`routing-controls-${this.fileId}-0`) as
+        let source = get(map)?.getSource('routing-controls-0') as GeoJSONSource | undefined;
-            | GeoJSONSource
-            | undefined;
         if (source) {
             if (this.temporaryAnchor) {
                 source.updateData({
@@ -1118,9 +1091,7 @@ export class RoutingControls {
             return;
         }
         const map_ = get(map);
-        let source = map_?.getSource(`routing-controls-${this.fileId}-0`) as
+        let source = map_?.getSource('routing-controls-0') as GeoJSONSource | undefined;
-            | GeoJSONSource
-            | undefined;
         if (source) {
             if (this.temporaryAnchor) {
                 source.updateData({

website/src/lib/components/toolbar/tools/routing/routing.ts

@@ -17,7 +17,7 @@ export const routingProfiles: { [key: string]: RoutingProfile } = {
     gravel_bike: { engine: 'graphhopper', profile: 'gravelbike' },
     mountain_bike: { engine: 'graphhopper', profile: 'mtb' },
     foot: { engine: 'graphhopper', profile: 'foot' },
-    motorcycle: { engine: 'graphhopper', profile: 'motorbike' },
+    motorcycle: { engine: 'graphhopper', profile: 'motorcycle' },
     water: { engine: 'brouter', profile: 'river' },
     railway: { engine: 'brouter', profile: 'rail' },
 };

website/src/lib/components/toolbar/tools/scissors/split-controls.ts

@@ -8,13 +8,13 @@ import { get } from 'svelte/store';
 import { fileStateCollection } from '$lib/logic/file-state';
 import { fileActions } from '$lib/logic/file-actions';
 import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
-import type { Map, GeoJSONSource, MapLayerMouseEvent } from 'maplibre-gl';
+import type { GeoJSONSource } from 'maplibre-gl';
 import { ANCHOR_LAYER_KEY } from '$lib/components/map/style';
 import type { MapLayerEventManager } from '$lib/components/map/map-layer-event-manager';
 import { loadSVGIcon } from '$lib/utils';
 
 export class SplitControls {
-    map: Map;
+    map: maplibregl.Map;
     layerEventManager: MapLayerEventManager;
     unsubscribes: Function[] = [];
 
@@ -22,7 +22,7 @@ export class SplitControls {
     layerOnMouseLeaveBinded: () => void = this.layerOnMouseLeave.bind(this);
     layerOnClickBinded: (e: any) => void = this.layerOnClick.bind(this);
 
-    constructor(map: Map, layerEventManager: MapLayerEventManager) {
+    constructor(map: maplibregl.Map, layerEventManager: MapLayerEventManager) {
         this.map = map;
         this.layerEventManager = layerEventManager;
         loadSVGIcon(
@@ -160,7 +160,7 @@ export class SplitControls {
         mapCursor.notify(MapCursorState.SPLIT_CONTROL, false);
     }
 
-    layerOnClick(e: MapLayerMouseEvent) {
+    layerOnClick(e: maplibregl.MapLayerMouseEvent) {
         let coordinates = (e.features![0].geometry as GeoJSON.Point).coordinates;
         fileActions.split(
             get(splitAs),

website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte

@@ -16,7 +16,7 @@
     import { fileActions } from '$lib/logic/file-actions';
     import { map } from '$lib/components/map/map';
     import { mapCursor, MapCursorState } from '$lib/logic/map-cursor';
-    import { Marker } from 'maplibre-gl';
+    import maplibregl from 'maplibre-gl';
     import { getSvgForSymbol } from '$lib/components/map/gpx-layer/gpx-layer';
 
     let props: {
@@ -41,7 +41,7 @@
         })
     );
 
-    let marker: Marker | null = null;
+    let marker: maplibregl.Marker | null = null;
 
     function reset() {
         if ($selectedWaypoint) {
@@ -125,7 +125,7 @@
                     let element = document.createElement('div');
                     element.classList.add('w-8', 'h-8');
                     element.innerHTML = getSvgForSymbol(symbolKey);
-                    marker = new Marker({
+                    marker = new maplibregl.Marker({
                         element,
                         anchor: 'bottom',
                     })
@@ -161,17 +161,14 @@
 </script>
 
 <div class="flex flex-col gap-3 w-full max-w-96 {props.class ?? ''}">
-    <fieldset class="flex flex-col gap-1.5">
+    <fieldset class="flex flex-col gap-2">
-        <div class="flex flex-col gap-1">
         <Label for="name">{i18n._('menu.metadata.name')}</Label>
         <Input
             bind:value={name}
             id="name"
-                class="font-semibold"
+            class="font-semibold h-8"
             disabled={!canCreate && !$selectedWaypoint}
         />
-        </div>
-        <div class="flex flex-col gap-1">
         <Label for="description">{i18n._('menu.metadata.description')}</Label>
         <Textarea
             bind:value={description}
@@ -179,12 +176,11 @@
             disabled={!canCreate && !$selectedWaypoint}
             class="min-h-8 h-8 py-1 px-3 text-sm"
         />
-        </div>
-        <div class="flex flex-col gap-1">
         <Label for="symbol">{i18n._('toolbar.waypoint.icon')}</Label>
         <Select.Root bind:value={sym} type="single">
             <Select.Trigger
                 id="symbol"
+                size="sm"
                 class="w-full"
                 disabled={!canCreate && !$selectedWaypoint}
             >
@@ -200,7 +196,7 @@
                     {/if}
                 </span>
             </Select.Trigger>
-                <Select.Content class="max-h-60">
+            <Select.Content class="max-h-60 overflow-y-scroll">
                 {#each sortedSymbols as [key, symbol]}
                     <Select.Item value={symbol.value}>
                         <span>
@@ -216,8 +212,6 @@
                 {/each}
             </Select.Content>
         </Select.Root>
-        </div>
-        <div class="flex flex-col gap-1">
         <Label for="link">{i18n._('toolbar.waypoint.link')}</Label>
         <Input
             bind:value={link}
@@ -225,9 +219,8 @@
             class="h-8"
             disabled={!canCreate && !$selectedWaypoint}
         />
-        </div>
+        <div class="flex flex-row gap-2">
-        <div class="flex flex-row gap-1.5">
+            <div class="grow flex flex-col gap-2">
-            <div class="grow flex flex-col gap-1">
                 <Label for="latitude">{i18n._('toolbar.waypoint.latitude')}</Label>
                 <Input
                     bind:value={latitude}
@@ -240,7 +233,7 @@
                     disabled={!canCreate && !$selectedWaypoint}
                 />
             </div>
-            <div class="grow flex flex-col gap-1">
+            <div class="grow flex flex-col gap-2">
                 <Label for="longitude">{i18n._('toolbar.waypoint.longitude')}</Label>
                 <Input
                     bind:value={longitude}
@@ -255,11 +248,11 @@
             </div>
         </div>
     </fieldset>
-    <div class="flex flex-row gap-1.5 items-center">
+    <div class="flex flex-row gap-2 items-center">
         <Button
             variant="outline"
             disabled={!canCreate && !$selectedWaypoint}
-            class="grow shrink h-fit min-h-8 whitespace-normal py-1"
+            class="grow whitespace-normal h-fit"
             onclick={createOrUpdateWaypoint}
         >
             {#if $selectedWaypoint}

website/src/lib/components/ui/accordion/accordion-content.svelte

@@ -13,15 +13,10 @@
 <AccordionPrimitive.Content
 	bind:ref
 	data-slot="accordion-content"
-	class="data-open:animate-accordion-down data-closed:animate-accordion-up text-sm overflow-hidden"
+	class="data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down overflow-hidden text-sm"
 	{...restProps}
 >
-	<div
+	<div class={cn("pb-4 pt-0", className)}>
-		class={cn(
-			"pt-0 pb-2.5 [&_a]:hover:text-foreground [&_a]:underline [&_a]:underline-offset-3 [&_p:not(:last-child)]:mb-4",
-			className
-		)}
-	>
 		{@render children?.()}
 	</div>
 </AccordionPrimitive.Content>

website/src/lib/components/ui/accordion/accordion-item.svelte

@@ -12,6 +12,6 @@
 <AccordionPrimitive.Item
 	bind:ref
 	data-slot="accordion-item"
-	class={cn("not-last:border-b", className)}
+	class={cn("border-b last:border-b-0", className)}
 	{...restProps}
 />

website/src/lib/components/ui/accordion/accordion-trigger.svelte

@@ -1,8 +1,7 @@
 <script lang="ts">
 	import { Accordion as AccordionPrimitive } from "bits-ui";
+	import ChevronDownIcon from "@lucide/svelte/icons/chevron-down";
 	import { cn, type WithoutChild } from "$lib/utils.js";
-	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
-	import ChevronUpIcon from '@lucide/svelte/icons/chevron-up';
 
 	let {
 		ref = $bindable(null),
@@ -20,13 +19,14 @@
 		data-slot="accordion-trigger"
 		bind:ref
 		class={cn(
-			"focus-visible:ring-ring/50 focus-visible:border-ring focus-visible:after:border-ring **:data-[slot=accordion-trigger-icon]:text-muted-foreground rounded-lg py-2.5 text-left text-sm font-medium hover:underline focus-visible:ring-3 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 group/accordion-trigger relative flex flex-1 items-start justify-between border border-transparent transition-all outline-none disabled:pointer-events-none disabled:opacity-50",
+			"focus-visible:border-ring focus-visible:ring-ring/50 flex flex-1 items-start justify-between gap-4 rounded-md py-4 text-left text-sm font-medium outline-none transition-all hover:underline focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&[data-state=open]>svg]:rotate-180",
 			className
 		)}
 		{...restProps}
 	>
 		{@render children?.()}
-		<ChevronDownIcon data-slot="accordion-trigger-icon" class="cn-accordion-trigger-icon pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden" />
+		<ChevronDownIcon
-		<ChevronUpIcon data-slot="accordion-trigger-icon" class="cn-accordion-trigger-icon pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline" />
+			class="text-muted-foreground pointer-events-none size-4 shrink-0 translate-y-0.5 transition-transform duration-200"
+		/>
 	</AccordionPrimitive.Trigger>
 </AccordionPrimitive.Header>

website/src/lib/components/ui/accordion/accordion.svelte

@@ -1,11 +1,9 @@
 <script lang="ts">
 	import { Accordion as AccordionPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
 
 	let {
 		ref = $bindable(null),
 		value = $bindable(),
-		class: className,
 		...restProps
 	}: AccordionPrimitive.RootProps = $props();
 </script>
@@ -14,6 +12,5 @@
 	bind:ref
 	bind:value={value as never}
 	data-slot="accordion"
-	class={cn("cn-accordion flex w-full flex-col", className)}
 	{...restProps}
 />

website/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte

@@ -1,27 +1,18 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
-	import {
+	import { buttonVariants } from "$lib/components/ui/button/index.js";
-		buttonVariants,
-		type ButtonVariant,
-		type ButtonSize,
-	} from "$lib/components/ui/button/index.js";
 	import { cn } from "$lib/utils.js";
 
 	let {
 		ref = $bindable(null),
 		class: className,
-		variant = "default",
-		size = "default",
 		...restProps
-	}: AlertDialogPrimitive.ActionProps & {
+	}: AlertDialogPrimitive.ActionProps = $props();
-		variant?: ButtonVariant;
-		size?: ButtonSize;
-	} = $props();
 </script>
 
 <AlertDialogPrimitive.Action
 	bind:ref
 	data-slot="alert-dialog-action"
-	class={cn(buttonVariants({ variant, size }), "cn-alert-dialog-action", className)}
+	class={cn(buttonVariants(), className)}
 	{...restProps}
 />

website/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte

@@ -1,27 +1,18 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
-	import {
+	import { buttonVariants } from "$lib/components/ui/button/index.js";
-		buttonVariants,
-		type ButtonVariant,
-		type ButtonSize,
-	} from "$lib/components/ui/button/index.js";
 	import { cn } from "$lib/utils.js";
 
 	let {
 		ref = $bindable(null),
 		class: className,
-		variant = "outline",
-		size = "default",
 		...restProps
-	}: AlertDialogPrimitive.CancelProps & {
+	}: AlertDialogPrimitive.CancelProps = $props();
-		variant?: ButtonVariant;
-		size?: ButtonSize;
-	} = $props();
 </script>
 
 <AlertDialogPrimitive.Cancel
 	bind:ref
 	data-slot="alert-dialog-cancel"
-	class={cn(buttonVariants({ variant, size }), "cn-alert-dialog-cancel", className)}
+	class={cn(buttonVariants({ variant: "outline" }), className)}
 	{...restProps}
 />

website/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte

@@ -1,32 +1,27 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
-	import AlertDialogPortal from "./alert-dialog-portal.svelte";
 	import AlertDialogOverlay from "./alert-dialog-overlay.svelte";
 	import { cn, type WithoutChild, type WithoutChildrenOrChild } from "$lib/utils.js";
-	import type { ComponentProps } from "svelte";
 
 	let {
 		ref = $bindable(null),
 		class: className,
-		size = "default",
 		portalProps,
 		...restProps
 	}: WithoutChild<AlertDialogPrimitive.ContentProps> & {
-		size?: "default" | "sm";
+		portalProps?: WithoutChildrenOrChild<AlertDialogPrimitive.PortalProps>;
-		portalProps?: WithoutChildrenOrChild<ComponentProps<typeof AlertDialogPortal>>;
 	} = $props();
 </script>
 
-<AlertDialogPortal {...portalProps}>
+<AlertDialogPrimitive.Portal {...portalProps}>
 	<AlertDialogOverlay />
 	<AlertDialogPrimitive.Content
 		bind:ref
 		data-slot="alert-dialog-content"
-		data-size={size}
 		class={cn(
-			"data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 bg-popover text-popover-foreground ring-foreground/10 gap-4 rounded-xl p-4 ring-1 duration-100 data-[size=default]:max-w-xs data-[size=sm]:max-w-xs data-[size=default]:sm:max-w-sm group/alert-dialog-content fixed top-1/2 left-1/2 z-50 grid w-full -translate-x-1/2 -translate-y-1/2 outline-none",
+			"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed left-[50%] top-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
 			className
 		)}
 		{...restProps}
 	/>
-</AlertDialogPortal>
+</AlertDialogPrimitive.Portal>

website/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte

@@ -12,6 +12,6 @@
 <AlertDialogPrimitive.Description
 	bind:ref
 	data-slot="alert-dialog-description"
-	class={cn("text-muted-foreground *:[a]:hover:text-foreground text-sm text-balance md:text-pretty *:[a]:underline *:[a]:underline-offset-3", className)}
+	class={cn("text-muted-foreground text-sm", className)}
 	{...restProps}
 />

website/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte

@@ -13,10 +13,7 @@
 <div
 	bind:this={ref}
 	data-slot="alert-dialog-footer"
-	class={cn(
+	class={cn("flex flex-col-reverse gap-2 sm:flex-row sm:justify-end", className)}
-		"bg-muted/50 -mx-4 -mb-4 rounded-b-xl border-t p-4 flex flex-col-reverse gap-2 group-data-[size=sm]/alert-dialog-content:grid group-data-[size=sm]/alert-dialog-content:grid-cols-2 sm:flex-row sm:justify-end",
-		className
-	)}
 	{...restProps}
 >
 	{@render children?.()}

website/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte

@@ -13,7 +13,7 @@
 <div
 	bind:this={ref}
 	data-slot="alert-dialog-header"
-	class={cn("grid grid-rows-[auto_1fr] place-items-center gap-1.5 text-center has-data-[slot=alert-dialog-media]:grid-rows-[auto_auto_1fr] has-data-[slot=alert-dialog-media]:gap-x-4 sm:group-data-[size=default]/alert-dialog-content:place-items-start sm:group-data-[size=default]/alert-dialog-content:text-left sm:group-data-[size=default]/alert-dialog-content:has-data-[slot=alert-dialog-media]:grid-rows-[auto_1fr]", className)}
+	class={cn("flex flex-col gap-2 text-center sm:text-left", className)}
 	{...restProps}
 >
 	{@render children?.()}

website/src/lib/components/ui/alert-dialog/alert-dialog-media.svelte

@@ -1,20 +0,0 @@
-<script lang="ts">
-	import type { HTMLAttributes } from "svelte/elements";
-	import { cn, type WithElementRef } from "$lib/utils.js";
-
-	let {
-		ref = $bindable(null),
-		class: className,
-		children,
-		...restProps
-	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
-</script>
-
-<div
-	bind:this={ref}
-	data-slot="alert-dialog-media"
-	class={cn("bg-muted mb-2 inline-flex size-10 items-center justify-center rounded-md sm:group-data-[size=default]/alert-dialog-content:row-span-2 *:[svg:not([class*='size-'])]:size-6", className)}
-	{...restProps}
->
-	{@render children?.()}
-</div>

website/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte

@@ -12,6 +12,9 @@
 <AlertDialogPrimitive.Overlay
 	bind:ref
 	data-slot="alert-dialog-overlay"
-	class={cn("data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 bg-black/10 duration-100 supports-backdrop-filter:backdrop-blur-xs fixed inset-0 z-50", className)}
+	class={cn(
+		"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
+		className
+	)}
 	{...restProps}
 />

website/src/lib/components/ui/alert-dialog/alert-dialog-portal.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
 
-	let { ...restProps }: AlertDialogPrimitive.PortalProps = $props();
+	type $$Props = AlertDialogPrimitive.PortalProps;
 </script>
 
-<AlertDialogPrimitive.Portal {...restProps} />
+<AlertDialogPrimitive.Portal {...$$restProps}>
+	<slot />
+</AlertDialogPrimitive.Portal>

website/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte

@@ -12,6 +12,6 @@
 <AlertDialogPrimitive.Title
 	bind:ref
 	data-slot="alert-dialog-title"
-	class={cn("text-base font-medium sm:group-data-[size=default]/alert-dialog-content:group-has-data-[slot=alert-dialog-media]/alert-dialog-content:col-start-2", className)}
+	class={cn("text-lg font-semibold", className)}
 	{...restProps}
 />

website/src/lib/components/ui/alert-dialog/alert-dialog.svelte

@@ -1,7 +0,0 @@
-<script lang="ts">
-	import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
-
-	let { open = $bindable(false), ...restProps }: AlertDialogPrimitive.RootProps = $props();
-</script>
-
-<AlertDialogPrimitive.Root bind:open {...restProps} />

website/src/lib/components/ui/alert-dialog/index.ts

@@ -1,5 +1,4 @@
-import Root from "./alert-dialog.svelte";
+import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
-import Portal from "./alert-dialog-portal.svelte";
 import Trigger from "./alert-dialog-trigger.svelte";
 import Title from "./alert-dialog-title.svelte";
 import Action from "./alert-dialog-action.svelte";
@@ -9,7 +8,9 @@ import Header from "./alert-dialog-header.svelte";
 import Overlay from "./alert-dialog-overlay.svelte";
 import Content from "./alert-dialog-content.svelte";
 import Description from "./alert-dialog-description.svelte";
-import Media from "./alert-dialog-media.svelte";
+
+const Root = AlertDialogPrimitive.Root;
+const Portal = AlertDialogPrimitive.Portal;
 
 export {
 	Root,
@@ -23,7 +24,6 @@ export {
 	Overlay,
 	Content,
 	Description,
-	Media,
 	//
 	Root as AlertDialog,
 	Title as AlertDialogTitle,
@@ -36,5 +36,4 @@ export {
 	Overlay as AlertDialogOverlay,
 	Content as AlertDialogContent,
 	Description as AlertDialogDescription,
-	Media as AlertDialogMedia,
 };

website/src/lib/components/ui/alert/alert-action.svelte

@@ -1,20 +0,0 @@
-<script lang="ts">
-	import type { HTMLAttributes } from "svelte/elements";
-	import { cn, type WithElementRef } from "$lib/utils.js";
-
-	let {
-		ref = $bindable(null),
-		class: className,
-		children,
-		...restProps
-	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
-</script>
-
-<div
-	bind:this={ref}
-	data-slot="alert-action"
-	class={cn("absolute top-2 right-2", className)}
-	{...restProps}
->
-	{@render children?.()}
-</div>

website/src/lib/components/ui/alert/alert-description.svelte

@@ -14,7 +14,7 @@
 	bind:this={ref}
 	data-slot="alert-description"
 	class={cn(
-		"text-muted-foreground text-sm text-balance md:text-pretty [&_p:not(:last-child)]:mb-4 [&_a]:hover:text-foreground [&_a]:underline [&_a]:underline-offset-3",
+		"text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed",
 		className
 	)}
 	{...restProps}

website/src/lib/components/ui/alert/alert-title.svelte

@@ -13,10 +13,7 @@
 <div
 	bind:this={ref}
 	data-slot="alert-title"
-	class={cn(
+	class={cn("col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight", className)}
-		"font-medium group-has-[>svg]/alert:col-start-2 [&_a]:hover:text-foreground [&_a]:underline [&_a]:underline-offset-3",
-		className
-	)}
 	{...restProps}
 >
 	{@render children?.()}

website/src/lib/components/ui/alert/alert.svelte

@@ -2,11 +2,12 @@
 	import { type VariantProps, tv } from "tailwind-variants";
 
 	export const alertVariants = tv({
-		base: "grid gap-0.5 rounded-lg border px-2.5 py-2 text-left text-sm has-data-[slot=alert-action]:relative has-data-[slot=alert-action]:pr-18 has-[>svg]:grid-cols-[auto_1fr] has-[>svg]:gap-x-2 *:[svg]:row-span-2 *:[svg]:translate-y-0.5 *:[svg]:text-current *:[svg:not([class*='size-'])]:size-4 group/alert relative w-full",
+		base: "relative grid w-full grid-cols-[0_1fr] items-start gap-y-0.5 rounded-lg border px-4 py-3 text-sm has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] has-[>svg]:gap-x-3 [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current",
 		variants: {
 			variant: {
 				default: "bg-card text-card-foreground",
-				destructive: "text-destructive bg-card *:data-[slot=alert-description]:text-destructive/90 *:[svg]:text-current",
+				destructive:
+					"text-destructive bg-card *:data-[slot=alert-description]:text-destructive/90 [&>svg]:text-current",
 			},
 		},
 		defaultVariants: {
@@ -35,9 +36,9 @@
 <div
 	bind:this={ref}
 	data-slot="alert"
-	role="alert"
 	class={cn(alertVariants({ variant }), className)}
 	{...restProps}
+	role="alert"
 >
 	{@render children?.()}
 </div>

website/src/lib/components/ui/alert/index.ts

@@ -1,17 +1,14 @@
 import Root from "./alert.svelte";
 import Description from "./alert-description.svelte";
 import Title from "./alert-title.svelte";
-import Action from "./alert-action.svelte";
 export { alertVariants, type AlertVariant } from "./alert.svelte";
 
 export {
 	Root,
 	Description,
 	Title,
-	Action,
 	//
 	Root as Alert,
 	Description as AlertDescription,
 	Title as AlertTitle,
-	Action as AlertAction,
 };

website/src/lib/components/ui/button/button.svelte

@@ -4,25 +4,25 @@
 	import { type VariantProps, tv } from "tailwind-variants";
 
 	export const buttonVariants = tv({
-		base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 rounded-lg border border-transparent bg-clip-padding text-sm font-medium focus-visible:ring-3 active:not-aria-[haspopup]:translate-y-px aria-invalid:ring-3 [&_svg:not([class*='size-'])]:size-4 group/button inline-flex shrink-0 items-center justify-center whitespace-nowrap transition-all outline-none select-none disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+		base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
 		variants: {
 			variant: {
-				default: "bg-primary text-primary-foreground [a]:hover:bg-primary/80",
+				default: "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
-				outline: "border-border bg-background hover:bg-muted hover:text-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 aria-expanded:bg-muted aria-expanded:text-foreground",
+				destructive:
-				secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80 aria-expanded:bg-secondary aria-expanded:text-secondary-foreground",
+					"bg-destructive shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white",
-				ghost: "hover:bg-muted hover:text-foreground dark:hover:bg-muted/50 aria-expanded:bg-muted aria-expanded:text-foreground",
+				outline:
-				destructive: "bg-destructive/10 hover:bg-destructive/20 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/20 text-destructive focus-visible:border-destructive/40 dark:hover:bg-destructive/30",
+					"bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border",
+				secondary: "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
+				ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
 				link: "text-primary underline-offset-4 hover:underline",
 			},
 			size: {
-				default: "h-8 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
+				default: "h-9 px-4 py-2 has-[>svg]:px-3",
-				xs: "h-6 gap-1 rounded-[min(var(--radius-md),10px)] px-2 text-xs in-data-[slot=button-group]:rounded-lg has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3",
+				sm: "h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5",
-				sm: "h-7 gap-1 rounded-[min(var(--radius-md),12px)] px-2.5 text-[0.8rem] in-data-[slot=button-group]:rounded-lg has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5",
+				lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
-				lg: "h-9 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
+				icon: "size-9",
-				icon: "size-8",
+				"icon-sm": "size-8",
-				"icon-xs": "size-6 rounded-[min(var(--radius-md),10px)] in-data-[slot=button-group]:rounded-lg [&_svg:not([class*='size-'])]:size-3",
+				"icon-lg": "size-10",
-				"icon-sm": "size-7 rounded-[min(var(--radius-md),12px)] in-data-[slot=button-group]:rounded-lg",
-				"icon-lg": "size-9",
 			},
 		},
 		defaultVariants: {

website/src/lib/components/ui/calendar/calendar-cell.svelte

@@ -12,7 +12,7 @@
 <CalendarPrimitive.Cell
 	bind:ref
 	class={cn(
-		"relative size-(--cell-size) p-0 text-center text-sm focus-within:z-20 [&:first-child[data-selected]_[data-bits-day]]:rounded-s-(--cell-radius) [&:last-child[data-selected]_[data-bits-day]]:rounded-e-(--cell-radius)",
+		"size-(--cell-size) relative p-0 text-center text-sm focus-within:z-20 [&:first-child[data-selected]_[data-bits-day]]:rounded-l-md [&:last-child[data-selected]_[data-bits-day]]:rounded-r-md",
 		className
 	)}
 	{...restProps}

website/src/lib/components/ui/calendar/calendar-day.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { buttonVariants } from "$lib/components/ui/button/index.js";
 	import { cn } from "$lib/utils.js";
 	import { Calendar as CalendarPrimitive } from "bits-ui";
 
@@ -12,17 +13,18 @@
 <CalendarPrimitive.Day
 	bind:ref
 	class={cn(
-		"flex size-(--cell-size) flex-col items-center justify-center gap-1 rounded-(--cell-radius) p-0 leading-none font-normal whitespace-nowrap select-none",
+		buttonVariants({ variant: "ghost" }),
-		"[&:last-child[data-selected=true]_button]:rounded-r-(--cell-radius)",
+		"size-(--cell-size) flex select-none flex-col items-center justify-center gap-1 whitespace-nowrap p-0 font-normal leading-none",
-		"not-data-selected:hover:bg-accent/50 not-data-selected:hover:text-accent-foreground",
 		"[&[data-today]:not([data-selected])]:bg-accent [&[data-today]:not([data-selected])]:text-accent-foreground [&[data-today][data-disabled]]:text-muted-foreground",
-		"data-[selected]:bg-primary data-[selected]:text-primary-foreground data-[selected]:hover:text-foreground",
+		"data-[selected]:bg-primary dark:data-[selected]:hover:bg-accent/50 data-[selected]:text-primary-foreground",
 		// Outside months
 		"[&[data-outside-month]:not([data-selected])]:text-muted-foreground [&[data-outside-month]:not([data-selected])]:hover:text-accent-foreground",
 		// Disabled
 		"data-[disabled]:text-muted-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
 		// Unavailable
 		"data-[unavailable]:text-muted-foreground data-[unavailable]:line-through",
+		// hover
+		"dark:hover:text-accent-foreground",
 		// focus
 		"focus:border-ring focus:ring-ring/50 focus:relative",
 		// inner spans

website/src/lib/components/ui/calendar/calendar-grid.svelte

@@ -11,6 +11,6 @@
 
 <CalendarPrimitive.Grid
 	bind:ref
-	class={cn("flex w-full border-collapse flex-col", className)}
+	class={cn("mt-4 flex w-full border-collapse flex-col gap-1", className)}
 	{...restProps}
 />

website/src/lib/components/ui/calendar/calendar-header.svelte

@@ -12,7 +12,7 @@
 <CalendarPrimitive.Header
 	bind:ref
 	class={cn(
-		"flex h-(--cell-size) w-full items-center justify-center gap-1.5 text-sm font-medium",
+		"h-(--cell-size) flex w-full items-center justify-center gap-1.5 text-sm font-medium",
 		className
 	)}
 	{...restProps}

website/src/lib/components/ui/calendar/calendar-month-select.svelte

@@ -14,15 +14,11 @@
 
 <span
 	class={cn(
-		"has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]",
+		"has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative flex rounded-md border",
 		className
 	)}
 >
-	<CalendarPrimitive.MonthSelect
+	<CalendarPrimitive.MonthSelect bind:ref class="absolute inset-0 opacity-0" {...restProps}>
-		bind:ref
-		class="bg-background dark:bg-popover dark:text-popover-foreground absolute inset-0 opacity-0"
-		{...restProps}
-	>
 		{#snippet child({ props, monthItems, selectedMonthItem })}
 			<select {...props} {value} {onchange}>
 				{#each monthItems as monthItem (monthItem.value)}
@@ -37,7 +33,7 @@
 				{/each}
 			</select>
 			<span
-				class="[&>svg]:text-muted-foreground flex h-(--cell-size) items-center gap-1 rounded-md ps-2 pe-1 text-sm font-medium select-none [&>svg]:size-3.5"
+				class="[&>svg]:text-muted-foreground flex h-8 select-none items-center gap-1 rounded-md pl-2 pr-1 text-sm font-medium [&>svg]:size-3.5"
 				aria-hidden="true"
 			>
 				{monthItems.find((item) => item.value === value)?.label || selectedMonthItem.label}

website/src/lib/components/ui/calendar/calendar-month.svelte

@@ -10,6 +10,6 @@
 	}: WithElementRef<HTMLAttributes<HTMLElement>> = $props();
 </script>
 
-<div {...restProps} bind:this={ref} class={cn("flex w-full flex-col gap-4", className)}>
+<div {...restProps} bind:this={ref} class={cn("flex flex-col", className)}>
 	{@render children?.()}
 </div>

website/src/lib/components/ui/calendar/calendar-next-button.svelte

@@ -23,14 +23,9 @@
 	bind:ref
 	class={cn(
 		buttonVariants({ variant }),
-		"size-(--cell-size) bg-transparent p-0 select-none disabled:opacity-50 rtl:rotate-180",
+		"size-(--cell-size) select-none bg-transparent p-0 disabled:opacity-50 rtl:rotate-180",
 		className
 	)}
+	children={children || Fallback}
 	{...restProps}
->
+/>
-	{#if children}
-		{@render children?.()}
-	{:else}
-		{@render Fallback()}
-	{/if}
-</CalendarPrimitive.NextButton>

website/src/lib/components/ui/calendar/calendar-prev-button.svelte

@@ -23,14 +23,9 @@
 	bind:ref
 	class={cn(
 		buttonVariants({ variant }),
-		"size-(--cell-size) bg-transparent p-0 select-none disabled:opacity-50 rtl:rotate-180",
+		"size-(--cell-size) select-none bg-transparent p-0 disabled:opacity-50 rtl:rotate-180",
 		className
 	)}
+	children={children || Fallback}
 	{...restProps}
->
+/>
-	{#if children}
-		{@render children?.()}
-	{:else}
-		{@render Fallback()}
-	{/if}
-</CalendarPrimitive.PrevButton>

website/src/lib/components/ui/calendar/calendar-year-select.svelte

@@ -13,15 +13,11 @@
 
 <span
 	class={cn(
-		"has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]",
+		"has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative flex rounded-md border",
 		className
 	)}
 >
-	<CalendarPrimitive.YearSelect
+	<CalendarPrimitive.YearSelect bind:ref class="absolute inset-0 opacity-0" {...restProps}>
-		bind:ref
-		class="dark:bg-popover dark:text-popover-foreground absolute inset-0 opacity-0"
-		{...restProps}
-	>
 		{#snippet child({ props, yearItems, selectedYearItem })}
 			<select {...props} {value}>
 				{#each yearItems as yearItem (yearItem.value)}
@@ -36,7 +32,7 @@
 				{/each}
 			</select>
 			<span
-				class="[&>svg]:text-muted-foreground flex h-(--cell-size) items-center gap-1 rounded-md ps-2 pe-1 text-sm font-medium select-none [&>svg]:size-3.5"
+				class="[&>svg]:text-muted-foreground flex h-8 select-none items-center gap-1 rounded-md pl-2 pr-1 text-sm font-medium [&>svg]:size-3.5"
 				aria-hidden="true"
 			>
 				{yearItems.find((item) => item.value === value)?.label || selectedYearItem.label}

website/src/lib/components/ui/calendar/calendar.svelte

@@ -50,7 +50,7 @@ get along, so we shut typescript up by casting `value` to `never`.
 	{weekdayFormat}
 	{disableDaysOutsideMonth}
 	class={cn(
-		"p-2 [--cell-radius:var(--radius-md)] [--cell-size:--spacing(7)] bg-background group/calendar in-data-[slot=card-content]:bg-transparent in-data-[slot=popover-content]:bg-transparent",
+		"bg-background group/calendar p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
 		className
 	)}
 	{locale}

website/src/lib/components/ui/card/card-action.svelte

@@ -13,10 +13,7 @@
 <div
 	bind:this={ref}
 	data-slot="card-action"
-	class={cn(
+	class={cn("col-start-2 row-span-2 row-start-1 self-start justify-self-end", className)}
-		"cn-card-action col-start-2 row-span-2 row-start-1 self-start justify-self-end",
-		className
-	)}
 	{...restProps}
 >
 	{@render children?.()}

website/src/lib/components/ui/card/card-content.svelte

@@ -10,11 +10,6 @@
 	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
 </script>
 
-<div
+<div bind:this={ref} data-slot="card-content" class={cn("px-6", className)} {...restProps}>
-	bind:this={ref}
-	data-slot="card-content"
-	class={cn("px-4 group-data-[size=sm]/card:px-3", className)}
-	{...restProps}
->
 	{@render children?.()}
 </div>

website/src/lib/components/ui/card/card-footer.svelte

@@ -13,7 +13,7 @@
 <div
 	bind:this={ref}
 	data-slot="card-footer"
-	class={cn("bg-muted/50 rounded-b-xl border-t p-4 group-data-[size=sm]/card:p-3 flex items-center", className)}
+	class={cn("[.border-t]:pt-6 flex items-center px-6", className)}
 	{...restProps}
 >
 	{@render children?.()}

website/src/lib/components/ui/card/card-header.svelte

@@ -14,7 +14,7 @@
 	bind:this={ref}
 	data-slot="card-header"
 	class={cn(
-		"gap-1 rounded-t-xl px-4 group-data-[size=sm]/card:px-3 [.border-b]:pb-4 group-data-[size=sm]/card:[.border-b]:pb-3 group/card-header @container/card-header grid auto-rows-min items-start has-data-[slot=card-action]:grid-cols-[1fr_auto] has-data-[slot=card-description]:grid-rows-[auto_auto]",
+		"@container/card-header has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6 grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6",
 		className
 	)}
 	{...restProps}

website/src/lib/components/ui/card/card-title.svelte

@@ -13,7 +13,7 @@
 <div
 	bind:this={ref}
 	data-slot="card-title"
-	class={cn("text-base leading-snug font-medium group-data-[size=sm]/card:text-sm", className)}
+	class={cn("font-semibold leading-none", className)}
 	{...restProps}
 >
 	{@render children?.()}

website/src/lib/components/ui/card/card.svelte

@@ -6,16 +6,17 @@
 		ref = $bindable(null),
 		class: className,
 		children,
-		size = "default",
 		...restProps
-	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & { size?: "default" | "sm" } = $props();
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
 </script>
 
 <div
 	bind:this={ref}
 	data-slot="card"
-	data-size={size}
+	class={cn(
-	class={cn("ring-foreground/10 bg-card text-card-foreground gap-4 overflow-hidden rounded-xl py-4 text-sm ring-1 has-data-[slot=card-footer]:pb-0 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 data-[size=sm]:has-data-[slot=card-footer]:pb-0 *:[img:first-child]:rounded-t-xl *:[img:last-child]:rounded-b-xl group/card flex flex-col", className)}
+		"bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
+		className
+	)}
 	{...restProps}
 >
 	{@render children?.()}

website/src/lib/components/ui/checkbox/checkbox.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { Checkbox as CheckboxPrimitive } from "bits-ui";
+	import CheckIcon from "@lucide/svelte/icons/check";
+	import MinusIcon from "@lucide/svelte/icons/minus";
 	import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
-	import CheckIcon from '@lucide/svelte/icons/check';
-	import MinusIcon from '@lucide/svelte/icons/minus';
 
 	let {
 		ref = $bindable(null),
@@ -17,7 +17,7 @@
 	bind:ref
 	data-slot="checkbox"
 	class={cn(
-		"border-input dark:bg-input/30 data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary data-checked:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 flex size-4 items-center justify-center rounded-[4px] border transition-colors group-has-disabled/field:opacity-50 focus-visible:ring-3 aria-invalid:ring-3 peer relative shrink-0 outline-none after:absolute after:-inset-x-3 after:-inset-y-2 disabled:cursor-not-allowed disabled:opacity-50",
+		"border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive shadow-xs peer flex size-4 shrink-0 items-center justify-center rounded-[4px] border outline-none transition-shadow focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
 		className
 	)}
 	bind:checked
@@ -25,14 +25,11 @@
 	{...restProps}
 >
 	{#snippet children({ checked, indeterminate })}
-		<div
+		<div data-slot="checkbox-indicator" class="text-current transition-none">
-			data-slot="checkbox-indicator"
-			class="[&>svg]:size-3.5 grid place-content-center text-current transition-none"
-		>
 			{#if checked}
-				<CheckIcon  />
+				<CheckIcon class="size-3.5" />
 			{:else if indeterminate}
-				<MinusIcon  />
+				<MinusIcon class="size-3.5" />
 			{/if}
 		</div>
 	{/snippet}

website/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte

@@ -1,19 +1,17 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from "bits-ui";
+	import CheckIcon from "@lucide/svelte/icons/check";
 	import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
 	import type { Snippet } from "svelte";
-	import CheckIcon from '@lucide/svelte/icons/check';
 
 	let {
 		ref = $bindable(null),
 		checked = $bindable(false),
 		indeterminate = $bindable(false),
 		class: className,
-		inset,
 		children: childrenProp,
 		...restProps
 	}: WithoutChildrenOrChild<ContextMenuPrimitive.CheckboxItemProps> & {
-		inset?: boolean;
 		children?: Snippet;
 	} = $props();
 </script>
@@ -23,17 +21,16 @@
 	bind:checked
 	bind:indeterminate
 	data-slot="context-menu-checkbox-item"
-	data-inset={inset}
 	class={cn(
-		"focus:bg-accent focus:text-accent-foreground gap-1.5 rounded-md py-1 pr-8 pl-1.5 text-sm data-inset:pl-7 [&_svg:not([class*='size-'])]:size-4 relative flex cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+		"data-highlighted:bg-accent data-highlighted:text-accent-foreground outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm py-1.5 pl-8 pr-2 text-sm data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
 		className
 	)}
 	{...restProps}
 >
 	{#snippet children({ checked })}
-		<span class="absolute right-2 pointer-events-none">
+		<span class="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
 			{#if checked}
-				<CheckIcon  />
+				<CheckIcon class="size-4" />
 			{/if}
 		</span>
 		{@render childrenProp?.()}

website/src/lib/components/ui/context-menu/context-menu-content.svelte

@@ -1,9 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from "bits-ui";
 	import { cn } from "$lib/utils.js";
-	import ContextMenuPortal from "./context-menu-portal.svelte";
-	import type { ComponentProps } from "svelte";
-	import type { WithoutChildrenOrChild } from "$lib/utils.js";
 
 	let {
 		ref = $bindable(null),
@@ -11,18 +8,18 @@
 		class: className,
 		...restProps
 	}: ContextMenuPrimitive.ContentProps & {
-		portalProps?: WithoutChildrenOrChild<ComponentProps<typeof ContextMenuPortal>>;
+		portalProps?: ContextMenuPrimitive.PortalProps;
 	} = $props();
 </script>
 
-<ContextMenuPortal {...portalProps}>
+<ContextMenuPrimitive.Portal {...portalProps}>
 	<ContextMenuPrimitive.Content
 		bind:ref
 		data-slot="context-menu-content"
 		class={cn(
-			"data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 bg-popover text-popover-foreground min-w-36 rounded-lg p-1 shadow-md ring-1 duration-100 z-50 overflow-x-hidden overflow-y-auto outline-none",
+			"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 max-h-(--bits-context-menu-content-available-height) origin-(--bits-context-menu-content-transform-origin) z-50 min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-md border p-1 shadow-md",
 			className
 		)}
 		{...restProps}
 	/>
-</ContextMenuPortal>
+</ContextMenuPrimitive.Portal>

website/src/lib/components/ui/context-menu/context-menu-group-heading.svelte

@@ -16,6 +16,6 @@
 	bind:ref
 	data-slot="context-menu-group-heading"
 	data-inset={inset}
-	class={cn("text-foreground px-2 py-1.5 text-sm font-medium data-inset:ps-8", className)}
+	class={cn("text-foreground px-2 py-1.5 text-sm font-medium data-[inset]:pl-8", className)}
 	{...restProps}
 />

website/src/lib/components/ui/context-menu/context-menu-item.svelte

@@ -20,7 +20,7 @@
 	data-inset={inset}
 	data-variant={variant}
 	class={cn(
-		"focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:text-destructive focus:*:[svg]:text-accent-foreground gap-1.5 rounded-md px-1.5 py-1 text-sm data-inset:pl-7 [&_svg:not([class*='size-'])]:size-4 group/context-menu-item relative flex cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+		"data-highlighted:bg-accent data-highlighted:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:data-highlighted:bg-destructive/10 dark:data-[variant=destructive]:data-highlighted:bg-destructive/20 data-[variant=destructive]:data-highlighted:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm data-[disabled]:pointer-events-none data-[inset]:pl-8 data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
 		className
 	)}
 	{...restProps}

website/src/lib/components/ui/context-menu/context-menu-label.svelte

@@ -17,7 +17,7 @@
 	bind:this={ref}
 	data-slot="context-menu-label"
 	data-inset={inset}
-	class={cn("text-muted-foreground px-1.5 py-1 text-xs font-medium data-inset:pl-7 data-inset:pl-8", className)}
+	class={cn("text-foreground px-2 py-1.5 text-sm font-medium data-[inset]:pl-8", className)}
 	{...restProps}
 >
 	{@render children?.()}

website/src/lib/components/ui/context-menu/context-menu-portal.svelte

@@ -1,7 +0,0 @@
-<script lang="ts">
-	import { ContextMenu as ContextMenuPrimitive } from "bits-ui";
-
-	let { ...restProps }: ContextMenuPrimitive.PortalProps = $props();
-</script>
-
-<ContextMenuPrimitive.Portal {...restProps} />

website/src/lib/components/ui/context-menu/context-menu-radio-item.svelte

@@ -1,33 +1,29 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from "bits-ui";
+	import CircleIcon from "@lucide/svelte/icons/circle";
 	import { cn, type WithoutChild } from "$lib/utils.js";
-	import CheckIcon from '@lucide/svelte/icons/check';
 
 	let {
 		ref = $bindable(null),
 		class: className,
-		inset,
 		children: childrenProp,
 		...restProps
-	}: WithoutChild<ContextMenuPrimitive.RadioItemProps> & {
+	}: WithoutChild<ContextMenuPrimitive.RadioItemProps> = $props();
-		inset?: boolean;
-	} = $props();
 </script>
 
 <ContextMenuPrimitive.RadioItem
 	bind:ref
 	data-slot="context-menu-radio-item"
-	data-inset={inset}
 	class={cn(
-		"focus:bg-accent focus:text-accent-foreground gap-1.5 rounded-md py-1 pr-8 pl-1.5 text-sm data-inset:pl-7 [&_svg:not([class*='size-'])]:size-4 relative flex cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+		"data-highlighted:bg-accent data-highlighted:text-accent-foreground outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm py-1.5 pl-8 pr-2 text-sm data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
 		className
 	)}
 	{...restProps}
 >
 	{#snippet children({ checked })}
-		<span class="absolute right-2 pointer-events-none">
+		<span class="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
 			{#if checked}
-				<CheckIcon  />
+				<CircleIcon class="size-2 fill-current" />
 			{/if}
 		</span>
 		{@render childrenProp?.({ checked })}