get styles from github

* New translations en.json (Dutch)

* New translations view.mdx (Dutch)

* New translations en.json (Spanish)

* New translations view.mdx (Spanish)

* New translations view.mdx (Dutch)

* New translations en.json (Chinese Simplified)

* New translations view.mdx (Chinese Simplified)

* New translations map-controls.mdx (Chinese Simplified)

* New translations files-and-stats.mdx (Serbian (Latin))

* New translations edit.mdx (Serbian (Latin))

* New translations elevation.mdx (Serbian (Latin))

* New translations en.json (Serbian (Latin))

* New translations files-and-stats.mdx (Serbian (Latin))

* New translations edit.mdx (Serbian (Latin))

* New translations file.mdx (Serbian (Latin))

* New translations settings.mdx (Serbian (Latin))

* New translations view.mdx (Serbian (Latin))

* New translations clean.mdx (Serbian (Latin))

* New translations extract.mdx (Serbian (Latin))

* New translations merge.mdx (Serbian (Latin))

* New translations poi.mdx (Serbian (Latin))

* New translations routing.mdx (Serbian (Latin))

* New translations scissors.mdx (Serbian (Latin))

* New translations time.mdx (Serbian (Latin))

* New translations elevation.mdx (Serbian (Latin))

* New translations minify.mdx (Serbian (Latin))

* New translations routing.mdx (Serbian (Latin))

* New translations faq.mdx (Serbian (Latin))

* New translations integration.mdx (Serbian (Latin))

* New translations files-and-stats.mdx (Serbian (Latin))

* New translations integration.mdx (Serbian (Latin))

* New translations map-controls.mdx (Serbian (Latin))

* New translations menu.mdx (Serbian (Latin))

* New translations edit.mdx (Serbian (Latin))

* New translations file.mdx (Serbian (Latin))

* New translations view.mdx (Serbian (Latin))

* New translations toolbar.mdx (Serbian (Latin))

* New translations routing.mdx (Serbian (Latin))

* New translations scissors.mdx (Serbian (Latin))

* New translations gpx.mdx (Serbian (Latin))

* New translations integration.mdx (Serbian (Latin))

* New translations en.json (Russian)

* New translations elevation.mdx (Dutch)

[ci skip]

* New translations map-controls.mdx (Dutch)

[ci skip]

* New translations elevation.mdx (Dutch)

[ci skip]

* New translations files-and-stats.mdx (Russian)

[ci skip]

* New translations view.mdx (Russian)

[ci skip]

* New translations clean.mdx (Norwegian)

[ci skip]

* New translations clean.mdx (Norwegian)

[ci skip]

* New translations en.json (Norwegian)

[ci skip]

* New translations poi.mdx (Norwegian)

[ci skip]

* New translations en.json (Indonesian)

[ci skip]

* New translations en.json (Dutch)

[ci skip]

website/components.json

@@ -1,17 +1,20 @@
 {
-    "$schema": "https://shadcn-svelte.com/schema.json",
+	"$schema": "https://shadcn-svelte.com/schema.json",
-    "style": "default",
+	"tailwind": {
-    "tailwind": {
+		"css": "src/app.css",
-        "css": "src/app.css",
+		"baseColor": "neutral"
-        "baseColor": "slate"
+	},
-    },
+	"aliases": {
-    "aliases": {
+		"components": "$lib/components",
-        "components": "$lib/components",
+		"utils": "$lib/utils",
-        "utils": "$lib/utils",
+		"ui": "$lib/components/ui",
-        "ui": "$lib/components/ui",
+		"hooks": "$lib/hooks",
-        "hooks": "$lib/hooks",
+		"lib": "$lib"
-        "lib": "$lib"
+	},
-    },
+	"typescript": true,
-    "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,7 +14,9 @@
         "format": "prettier --write . --config ../.prettierrc --ignore-path ../.prettierignore --ignore-path ./.gitignore"
     },
     "devDependencies": {
-        "@lucide/svelte": "^0.544.0",
+        "@fontsource-variable/inter": "^5.2.8",
+        "@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",
@@ -30,7 +32,8 @@
         "@types/sortablejs": "^1.15.8",
         "@typescript-eslint/eslint-plugin": "^8.33.1",
         "@typescript-eslint/parser": "^8.33.1",
-        "bits-ui": "^2.14.4",
+        "bits-ui": "^2.17.2",
+        "clsx": "^2.1.1",
         "eslint": "^9.28.0",
         "eslint-config-prettier": "^10.1.5",
         "eslint-plugin-svelte": "^3.9.1",
@@ -43,30 +46,29 @@
         "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.0.5",
+        "svelte-sonner": "^1.1.0",
-        "tailwind-variants": "^3.1.1",
+        "tailwind-merge": "^3.5.0",
+        "tailwind-variants": "^3.2.2",
         "tailwindcss": "^4.1.8",
         "tslib": "^2.8.1",
         "tsx": "^4.19.1",
-        "tw-animate-css": "^1.3.4",
+        "tw-animate-css": "^1.4.0",
         "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",
@@ -75,7 +77,6 @@
         "mapillary-js": "^4.1.2",
         "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,76 +1,93 @@
 @import 'tailwindcss';
 @import 'tw-animate-css';
+@import "shadcn-svelte/tailwind.css";
+@import "@fontsource-variable/inter";
 
 @custom-variant dark (&:is(.dark *));
 
 :root {
-    --background: hsl(0 0% 100%) /* <- Wrap in HSL */;
+    --background: oklch(1 0 0);
-    --foreground: hsl(240 10% 3.9%);
+    --foreground: oklch(0.145 0 0);
-    --muted: hsl(240 4.8% 95.9%);
+    --muted: oklch(0.97 0 0);
-    --muted-foreground: hsl(240 3.8% 46.1%);
+    --muted-foreground: oklch(0.556 0 0);
-    --popover: hsl(0 0% 100%);
+    --popover: oklch(1 0 0);
-    --popover-foreground: hsl(240 10% 3.9%);
+    --popover-foreground: oklch(0.145 0 0);
-    --card: hsl(0 0% 100%);
+    --card: oklch(1 0 0);
-    --card-foreground: hsl(240 10% 3.9%);
+    --card-foreground: oklch(0.145 0 0);
-    --border: hsl(240 5.9% 90%);
+    --border: oklch(0.922 0 0);
-    --input: hsl(240 5.9% 90%);
+    --input: oklch(0.922 0 0);
-    --primary: hsl(240 5.9% 10%);
+    --primary: oklch(0.205 0 0);
-    --primary-foreground: hsl(0 0% 98%);
+    --primary-foreground: oklch(0.985 0 0);
-    --secondary: hsl(240 4.8% 95.9%);
+    --secondary: oklch(0.97 0 0);
-    --secondary-foreground: hsl(240 5.9% 10%);
+    --secondary-foreground: oklch(0.205 0 0);
-    --accent: hsl(240 4.8% 95.9%);
+    --accent: oklch(0.97 0 0);
-    --accent-foreground: hsl(240 5.9% 10%);
+    --accent-foreground: oklch(0.205 0 0);
-    --destructive: hsl(0 72.2% 50.6%);
+    --destructive: oklch(0.577 0.245 27.325);
     --destructive-foreground: hsl(0 0% 98%);
-    --ring: hsl(240 10% 3.9%);
+    --ring: oklch(0.708 0 0);
-    --sidebar: hsl(0 0% 98%);
+    --sidebar: oklch(0.985 0 0);
-    --sidebar-foreground: hsl(240 5.3% 26.1%);
+    --sidebar-foreground: oklch(0.145 0 0);
-    --sidebar-primary: hsl(240 5.9% 10%);
+    --sidebar-primary: oklch(0.205 0 0);
-    --sidebar-primary-foreground: hsl(0 0% 98%);
+    --sidebar-primary-foreground: oklch(0.985 0 0);
-    --sidebar-accent: hsl(240 4.8% 95.9%);
+    --sidebar-accent: oklch(0.97 0 0);
-    --sidebar-accent-foreground: hsl(240 5.9% 10%);
+    --sidebar-accent-foreground: oklch(0.205 0 0);
-    --sidebar-border: hsl(220 13% 91%);
+    --sidebar-border: oklch(0.922 0 0);
-    --sidebar-ring: hsl(217.2 91.2% 59.8%);
+    --sidebar-ring: oklch(0.708 0 0);
 
     --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: hsl(240 10% 3.9%);
+    --background: oklch(0.145 0 0);
-    --foreground: hsl(0 0% 98%);
+    --foreground: oklch(0.985 0 0);
-    --muted: hsl(240 3.7% 15.9%);
+    --muted: oklch(0.269 0 0);
-    --muted-foreground: hsl(240 5% 64.9%);
+    --muted-foreground: oklch(0.708 0 0);
-    --popover: hsl(240 10% 3.9%);
+    --popover: oklch(0.205 0 0);
-    --popover-foreground: hsl(0 0% 98%);
+    --popover-foreground: oklch(0.985 0 0);
-    --card: hsl(240 10% 3.9%);
+    --card: oklch(0.205 0 0);
-    --card-foreground: hsl(0 0% 98%);
+    --card-foreground: oklch(0.985 0 0);
-    --border: hsl(240 3.7% 15.9%);
+    --border: oklch(1 0 0 / 10%);
-    --input: hsl(240 3.7% 15.9%);
+    --input: oklch(1 0 0 / 15%);
-    --primary: hsl(0 0% 98%);
+    --primary: oklch(0.922 0 0);
-    --primary-foreground: hsl(240 5.9% 10%);
+    --primary-foreground: oklch(0.205 0 0);
-    --secondary: hsl(240 3.7% 15.9%);
+    --secondary: oklch(0.269 0 0);
-    --secondary-foreground: hsl(0 0% 98%);
+    --secondary-foreground: oklch(0.985 0 0);
-    --accent: hsl(240 3.7% 15.9%);
+    --accent: oklch(0.269 0 0);
-    --accent-foreground: hsl(0 0% 98%);
+    --accent-foreground: oklch(0.985 0 0);
-    --destructive: hsl(0 62.8% 30.6%);
+    --destructive: oklch(0.704 0.191 22.216);
     --destructive-foreground: hsl(0 0% 98%);
-    --ring: hsl(240 4.9% 83.9%);
+    --ring: oklch(0.556 0 0);
-    --sidebar: hsl(240 5.9% 10%);
+    --sidebar: oklch(0.205 0 0);
-    --sidebar-foreground: hsl(240 4.8% 95.9%);
+    --sidebar-foreground: oklch(0.985 0 0);
-    --sidebar-primary: hsl(224.3 76.3% 48%);
+    --sidebar-primary: oklch(0.488 0.243 264.376);
-    --sidebar-primary-foreground: hsl(0 0% 100%);
+    --sidebar-primary-foreground: oklch(0.985 0 0);
-    --sidebar-accent: hsl(240 3.7% 15.9%);
+    --sidebar-accent: oklch(0.269 0 0);
-    --sidebar-accent-foreground: hsl(240 4.8% 95.9%);
+    --sidebar-accent-foreground: oklch(0.985 0 0);
-    --sidebar-border: hsl(240 3.7% 15.9%);
+    --sidebar-border: oklch(1 0 0 / 10%);
-    --sidebar-ring: hsl(217.2 91.2% 59.8%);
+    --sidebar-ring: oklch(0.556 0 0);
 
     --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 {
@@ -113,14 +130,35 @@
     --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;
+        @apply border-border outline-ring/50;
     }
 
     body {
         @apply bg-background text-foreground;
     }
+	html {
+		@apply font-sans;
+    }
 }

website/src/lib/assets/layers.ts

@@ -31,10 +31,30 @@ import bikerouterGravel from './custom/bikerouter-gravel.json';
 export const maptilerKeyPlaceHolder = 'MAPTILER_KEY';
 
 export const basemaps: { [key: string]: string | StyleSpecification } = {
-    maptilerStreets: `https://api.maptiler.com/maps/streets-v4/style.json?key=${maptilerKeyPlaceHolder}`,
+    topo: 'https://raw.githubusercontent.com/gpxstudio/styles/refs/heads/main/topo.json',
-    maptilerTopo: `https://api.maptiler.com/maps/topo-v4/style.json?key=${maptilerKeyPlaceHolder}`,
+    satellite: 'https://raw.githubusercontent.com/gpxstudio/styles/refs/heads/main/satellite.json',
-    maptilerOutdoors: `https://api.maptiler.com/maps/outdoor-v4/style.json?key=${maptilerKeyPlaceHolder}`,
+    esriSatellite: {
-    maptilerSatellite: `https://api.maptiler.com/maps/hybrid-v4/style.json?key=${maptilerKeyPlaceHolder}`,
+        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: {
@@ -777,10 +797,9 @@ export type LayerTreeType = { [key: string]: LayerTreeType | boolean };
 export const basemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            maptilerStreets: true,
+            topo: true,
-            maptilerTopo: true,
+            satellite: true,
-            maptilerOutdoors: true,
+            esriSatellite: true,
-            maptilerSatellite: true,
             openStreetMap: true,
             openTopoMap: true,
             openHikingMap: true,
@@ -913,7 +932,7 @@ export const overpassTree: LayerTreeType = {
 };
 
 // Default basemap used
-export const defaultBasemap = 'maptilerStreets';
+export const defaultBasemap = 'topo';
 
 // Default overlays used (none)
 export const defaultOverlays: LayerTreeType = {
@@ -1002,10 +1021,9 @@ export const defaultOverpassQueries: LayerTreeType = {
 export const defaultBasemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            maptilerStreets: true,
+            topo: true,
-            maptilerTopo: true,
+            satellite: true,
-            maptilerOutdoors: true,
+            esriSatellite: false,
-            maptilerSatellite: true,
             openStreetMap: true,
             openTopoMap: true,
             openHikingMap: true,
@@ -1463,14 +1481,11 @@ 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.mapterhorn.com/tilejson.json',
+        url: 'https://tiles.gpx.studio/mapterhorn.json',
+        encoding: 'terrarium',
     },
 };
 
-export const defaultTerrainSource = 'maptiler-dem';
+export const defaultTerrainSource = 'mapterhorn';

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'} border-none shadow-none p-0 text-sm sm:text-base bg-transparent"
+        : 'w-full h-fit my-1'} ring-0 p-0 text-sm sm:text-base bg-transparent"
 >
     <Card.Content class="h-full p-0">
         <div

website/src/lib/components/Help.svelte

@@ -14,12 +14,12 @@
     } = $props();
 </script>
 
-<div class="text-sm bg-secondary rounded border flex flex-row items-center p-2 {className}">
+<div class="text-[13px] 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-sm text-link hover:underline">
+            <a href={link} target="_blank" class="text-[13px] 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' | 'maptiler' | 'github' | 'crowdin' | 'facebook' | 'reddit';
+        company?: 'gpx.studio' | 'github' | 'crowdin' | 'facebook' | 'reddit';
         [key: string]: any;
     } = $props();
 </script>
@@ -19,12 +19,6 @@
         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,6 +43,8 @@
         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';
@@ -70,7 +72,7 @@
     import { copied, selection } from '$lib/logic/selection';
     import { allHidden } from '$lib/logic/hidden';
     import { boundsManager } from '$lib/logic/bounds';
-    import { tick } from 'svelte';
+    import { tick, onMount } from 'svelte';
     import { allowedPastes } from '$lib/components/file-list/sortable-file-list';
 
     const {
@@ -105,6 +107,23 @@
     }
 
     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">
@@ -377,6 +396,16 @@
                         {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>
@@ -389,7 +418,7 @@
                 <Menubar.Content class="border-none">
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <Ruler size="16" class="mr-2" />{i18n._('menu.distance_units')}
+                            <Ruler size="16" />{i18n._('menu.distance_units')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
                             <Menubar.RadioGroup bind:value={$distanceUnits}>
@@ -407,7 +436,7 @@
                     </Menubar.Sub>
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <Zap size="16" class="mr-2" />{i18n._('menu.velocity_units')}
+                            <Zap size="16" />{i18n._('menu.velocity_units')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
                             <Menubar.RadioGroup bind:value={$velocityUnits}>
@@ -422,7 +451,7 @@
                     </Menubar.Sub>
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <Thermometer size="16" class="mr-2" />{i18n._('menu.temperature_units')}
+                            <Thermometer size="16" />{i18n._('menu.temperature_units')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
                             <Menubar.RadioGroup bind:value={$temperatureUnits}>
@@ -438,7 +467,7 @@
                     <Menubar.Separator />
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <Languages size="16" class="mr-2" />
+                            <Languages size="16" />
                             {i18n._('menu.language')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
@@ -454,9 +483,9 @@
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
                             {#if mode.current === 'light' || !mode.current}
-                                <Sun size="16" class="mr-2" />
+                                <Sun size="16" />
                             {:else}
-                                <Moon size="16" class="mr-2" />
+                                <Moon size="16" />
                             {/if}
                             {i18n._('menu.mode')}
                         </Menubar.SubTrigger>
@@ -479,7 +508,7 @@
                     <Menubar.Separator />
                     <Menubar.Sub>
                         <Menubar.SubTrigger>
-                            <PersonStanding size="16" class="mr-2" />
+                            <PersonStanding size="16" />
                             {i18n._('menu.street_view_source')}
                         </Menubar.SubTrigger>
                         <Menubar.SubContent>
@@ -500,12 +529,12 @@
                 </Menubar.Content>
             </Menubar.Menu>
         </Menubar.Root>
-        <div class="h-fit flex flex-row items-center ml-1 gap-1">
+        <div class="h-fit flex flex-row items-center">
             <Button
                 variant="ghost"
                 href="./help"
                 target="_blank"
-                class="cursor-default h-fit rounded-sm px-3 py-0.5"
+                class="cursor-default h-fit rounded-md px-3 py-0.5"
                 aria-label={i18n._('menu.help')}
             >
                 <BookOpenText size="18" class="md:hidden" />
@@ -517,7 +546,7 @@
                 variant="ghost"
                 href="https://opencollective.com/gpxstudio"
                 target="_blank"
-                class="cursor-default h-fit rounded-sm font-bold text-support hover:text-support px-3 py-0.5"
+                class="cursor-default h-fit rounded-md 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 {side === 'right'
+                class="w-full flex flex-row gap-1 border-none {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 {side === 'right'
+            class="w-full flex flex-row gap-1 border-none {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 maptilerTopoMap from '$lib/assets/img/home/maptiler-topo.png?enhanced';
+    import topoMap from '$lib/assets/img/docs/maps/topo.png?enhanced';
-    import waymarkedMap from '$lib/assets/img/home/waymarked.png?enhanced';
+    import waymarkedMap from '$lib/assets/img/docs/maps/waymarked.png?enhanced';
 </script>
 
 <div class="relative h-80 aspect-square rounded-2xl shadow-xl overflow-clip">
-    <enhanced:img src={maptilerTopoMap} alt="MapTiler Topo map screenshot." class="absolute" />
+    <enhanced:img src={topoMap} alt="Topo map screenshot." class="absolute" />
     <enhanced:img
         src={waymarkedMap}
         alt="Waymarked Trails map screenshot."

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

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

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

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 focus-visible:ring-0 focus-visible:ring-offset-0 {orientation ===
+            class="relative w-full p-0 overflow-hidden border-none focus-visible:ring-0 focus-visible:ring-offset-0 flex flex-row {orientation ===
             'vertical'
-                ? 'h-fit'
+                ? 'h-7'
-                : 'h-9 px-1.5 shadow-md'} pointer-events-auto"
+                : 'h-9 px-1.5'} 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-1 w-1'
+                        ? 'top-0 bottom-0 right-0 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="w-full text-left truncate py-1 flex flex-row items-center {hidden
+                class="grow text-left truncate ml-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/gpx-layer/CopyCoordinates.svelte

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

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

@@ -39,7 +39,6 @@
         />
         {#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,7 +88,6 @@
             <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/layer-control/CustomLayers.svelte

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

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">
+                        <Accordion.Content class="grow flex flex-col border rounded-md mb-1.5">
                             <div class="py-2 pl-3 pr-2">
                                 <LayerTree
                                     layerTree={basemapTree}
@@ -152,7 +152,9 @@
                     </Accordion.Item>
                     <Accordion.Item value="overlay-opacity">
                         <Accordion.Trigger>{i18n._('layers.opacity')}</Accordion.Trigger>
-                        <Accordion.Content class="flex flex-col gap-3 overflow-visible">
+                        <Accordion.Content
+                            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')}
@@ -231,10 +233,10 @@
                     <Accordion.Item value="custom-layers">
                         <Accordion.Trigger>{i18n._('layers.custom_layers.title')}</Accordion.Trigger
                         >
-                        <Accordion.Content>
+                        <Accordion.Content
-                            <ScrollArea>
+                            class="flex flex-col overflow-visible border rounded-md p-0 mb-1.5"
-                                <CustomLayers />
+                        >
-                            </ScrollArea>
+                            <CustomLayers />
                         </Accordion.Content>
                     </Accordion.Item>
                     <Accordion.Item value="terrain-source">

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

@@ -142,6 +142,7 @@ export class MapLayerEventManager {
     }
 
     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] || [];

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

@@ -53,7 +53,7 @@
 <CustomControl class="w-[29px] h-[29px] shrink-0">
     <ButtonWithTooltip
         variant="ghost"
-        class="w-full h-full"
+        class="w-full h-full border-none rounded-sm"
         side="left"
         label={i18n._('menu.toggle_street_view')}
         onclick={() => {

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

@@ -10,7 +10,8 @@ import {
 import { getLayers } from '$lib/components/map/layer-control/utils';
 import { i18n } from '$lib/i18n.svelte';
 
-const { currentBasemap, currentOverlays, customLayers, opacities, terrainSource } = settings;
+const { currentBasemap, currentOverlays, customLayers, opacities, terrainSource, distanceUnits } =
+    settings;
 
 const emptySource: maplibregl.GeoJSONSourceSpecification = {
     type: 'geojson',
@@ -57,15 +58,21 @@ export class StyleManager {
         opacities.subscribe(() => this.updateOverlays());
         terrainSource.subscribe(() => this.updateTerrain());
         customLayers.subscribe(() => this.updateBasemap());
+        distanceUnits.subscribe(() => {
+            if (get(currentBasemap) === 'topo') this.updateBasemap();
+        });
     }
 
     updateBasemap() {
         const map_ = get(this._map);
         if (!map_) return;
-        this.buildStyle().then((style) => map_.setStyle(style));
+        let basemap = get(currentBasemap);
+        this.buildStyle(basemap).then((style) => {
+            if (get(currentBasemap) === basemap) map_.setStyle(style);
+        });
     }
 
-    async buildStyle(): Promise<maplibregl.StyleSpecification> {
+    async buildStyle(basemap: string): Promise<maplibregl.StyleSpecification> {
         const custom = get(customLayers);
 
         const style: maplibregl.StyleSpecification = {
@@ -79,17 +86,31 @@ 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 maplibregl.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();
-            const terrain = this.getCurrentTerrain();
+        style.sources[terrain.source] = terrainSources[terrain.source];
-            style.sources[terrain.source] = terrainSources[terrain.source];
+        style.terrain = terrain.exaggeration > 0 ? terrain : undefined;
-            style.terrain = terrain.exaggeration > 0 ? terrain : undefined;
-        }
 
         style.layers.push(...anchorLayers);
 
@@ -109,52 +130,58 @@ export class StyleManager {
                 if (!layers[overlay]) {
                     if (this._pastOverlays.has(overlay)) {
                         const overlayInfo = custom[overlay]?.value ?? overlays[overlay];
-                        const overlayStyle = await this.get(overlayInfo);
+                        try {
-                        for (let layer of overlayStyle.layers ?? []) {
+                            const overlayStyle = await this.get(overlayInfo);
-                            if (map_.getLayer(layer.id)) {
+                            for (let layer of overlayStyle.layers ?? []) {
-                                map_.removeLayer(layer.id);
+                                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];
-                    const overlayStyle = await this.get(overlayInfo);
+                    try {
-                    const opacity = overlayOpacities[overlay];
+                        const overlayStyle = await this.get(overlayInfo);
+                        const opacity = overlayOpacities[overlay];
 
-                    for (let sourceId in overlayStyle.sources) {
+                        for (let sourceId in overlayStyle.sources) {
-                        if (!map_.getSource(sourceId)) {
+                            if (!map_.getSource(sourceId)) {
-                            map_.addSource(sourceId, overlayStyle.sources[sourceId]);
+                                map_.addSource(sourceId, overlayStyle.sources[sourceId]);
-                        }
-                    }
-
-                    for (let layer of overlayStyle.layers ?? []) {
-                        if (!map_.getLayer(layer.id)) {
-                            if (opacity !== undefined) {
-                                if (layer.type === 'raster') {
-                                    if (!layer.paint) {
-                                        layer.paint = {};
-                                    }
-                                    layer.paint['raster-opacity'] = opacity;
-                                } else if (layer.type === 'hillshade') {
-                                    if (!layer.paint) {
-                                        layer.paint = {};
-                                    }
-                                    layer.paint['hillshade-exaggeration'] = opacity / 2;
-                                }
                             }
-                            map_.addLayer(layer, ANCHOR_LAYER_KEY.overlays);
                         }
-                    }
 
-                    this._pastOverlays.add(overlay);
+                        for (let layer of overlayStyle.layers ?? []) {
+                            if (!map_.getLayer(layer.id)) {
+                                if (opacity !== undefined) {
+                                    if (layer.type === 'raster') {
+                                        if (!layer.paint) {
+                                            layer.paint = {};
+                                        }
+                                        layer.paint['raster-opacity'] = opacity;
+                                    } else if (layer.type === 'hillshade') {
+                                        if (!layer.paint) {
+                                            layer.paint = {};
+                                        }
+                                        layer.paint['hillshade-exaggeration'] = opacity / 2;
+                                    }
+                                }
+                                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;
 
@@ -177,10 +204,10 @@ export class StyleManager {
     ): Promise<maplibregl.StyleSpecification> {
         if (typeof styleInfo === 'string') {
             let styleUrl = styleInfo as string;
-            if (styleUrl.includes(maptilerKeyPlaceHolder)) {
-                styleUrl = styleUrl.replace(maptilerKeyPlaceHolder, this._maptilerKey);
-            }
             const response = await fetch(styleUrl, { cache: 'force-cache' });
+            if (!response.ok) {
+                throw new Error(`HTTP error fetching style "${styleInfo}": ${response.status}`);
+            }
             const style = await response.json();
             return style;
         } else {
@@ -190,17 +217,23 @@ export class StyleManager {
 
     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) &&
-                    textField.length >= 2 &&
+                    textField.length == 4 &&
-                    textField[0] === 'coalesce' &&
+                    Array.isArray(textField[3]) &&
-                    Array.isArray(textField[1]) &&
+                    textField[3][0] === 'coalesce' &&
-                    textField[1][0] === 'get' &&
+                    Array.isArray(textField[3][1]) &&
-                    typeof textField[1][1] === 'string' &&
+                    textField[3][1][0] === 'get' &&
-                    textField[1][1].startsWith('name')
+                    typeof textField[3][1][1] === 'string' &&
+                    textField[3][1][1].startsWith('name')
                 ) {
                     layer.layout['text-field'] = [
                         'coalesce',
@@ -221,10 +254,6 @@ 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/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"
+        class="whitespace-normal h-fit min-h-8 py-1"
         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"
+        class="whitespace-normal h-fit min-h-8 py-1"
         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-2 justify-center">
+        <div class="flex flex-row gap-1.5 justify-center">
-            <div class="flex flex-col gap-2 grow">
+            <div class="flex flex-col gap-1 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-2 grow">
+            <div class="flex flex-col gap-1 grow">
                 <Label for="duration" class="flex flex-row">
                     <Timer size="16" />
                     {i18n._('toolbar.time.total_time')}
@@ -253,57 +253,61 @@
                 />
             </div>
         </div>
-        <Label class="flex flex-row">
+        <div class="flex flex-col gap-1">
-            <CirclePlay size="16" />
+            <Label class="flex flex-row">
-            {i18n._('toolbar.time.start')}
+                <CirclePlay size="16" />
-        </Label>
+                {i18n._('toolbar.time.start')}
-        <div class="flex flex-row gap-2">
+            </Label>
-            <DatePicker
+            <div class="flex flex-row gap-1.5">
-                bind:value={startDate}
+                <DatePicker
-                disabled={!canUpdate}
+                    bind:value={startDate}
-                locale={i18n.lang}
+                    disabled={!canUpdate}
-                placeholder={i18n._('toolbar.time.pick_date')}
+                    locale={i18n.lang}
-                class="w-fit grow"
+                    placeholder={i18n._('toolbar.time.pick_date')}
-                onchange={() => {
+                    class="w-fit grow"
-                    untrack(() => updateEnd());
+                    onchange={() => {
-                }}
+                        untrack(() => updateEnd());
-            />
+                    }}
-            <Input
+                />
-                type="time"
+                <Input
-                step={1}
+                    type="time"
-                disabled={!canUpdate}
+                    step={1}
-                bind:value={startTime}
+                    disabled={!canUpdate}
-                class="w-fit"
+                    bind:value={startTime}
-                onchange={() => {
+                    class="w-fit"
-                    untrack(() => updateEnd());
+                    onchange={() => {
-                }}
+                        untrack(() => updateEnd());
-            />
+                    }}
+                />
+            </div>
         </div>
-        <Label class="flex flex-row">
+        <div class="flex flex-col gap-1">
-            <CircleStop size="16" />
+            <Label class="flex flex-row">
-            {i18n._('toolbar.time.end')}
+                <CircleStop size="16" />
-        </Label>
+                {i18n._('toolbar.time.end')}
-        <div class="flex flex-row gap-2">
+            </Label>
-            <DatePicker
+            <div class="flex flex-row gap-1.5">
-                bind:value={endDate}
+                <DatePicker
-                disabled={!canUpdate}
+                    bind:value={endDate}
-                locale={i18n.lang}
+                    disabled={!canUpdate}
-                placeholder={i18n._('toolbar.time.pick_date')}
+                    locale={i18n.lang}
-                class="w-fit grow"
+                    placeholder={i18n._('toolbar.time.pick_date')}
-                onchange={() => {
+                    class="w-fit grow"
-                    untrack(() => updateStart());
+                    onchange={() => {
-                }}
+                        untrack(() => updateStart());
-            />
+                    }}
-            <Input
+                />
-                type="time"
+                <Input
-                step={1}
+                    type="time"
-                disabled={!canUpdate}
+                    step={1}
-                bind:value={endTime}
+                    disabled={!canUpdate}
-                class="w-fit"
+                    bind:value={endTime}
-                onchange={() => {
+                    class="w-fit"
-                    untrack(() => updateStart());
+                    onchange={() => {
-                }}
+                        untrack(() => updateStart());
-            />
+                    }}
+                />
+            </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">
@@ -314,11 +318,11 @@
             </div>
         {/if}
     </fieldset>
-    <div class="flex flex-row gap-2 items-center">
+    <div class="flex flex-row gap-1.5 items-center">
         <Button
             variant="outline"
             disabled={!canUpdate}
-            class="grow whitespace-normal h-fit"
+            class="grow shrink whitespace-normal h-fit min-h-8 py-1"
             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[0] / (100 / Math.log2(maxTolerance / minTolerance)))
+            minTolerance * 2 ** (sliderValue / (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="multiple" />
+        <Slider bind:value={sliderValue} min={0} max={100} step={1} type="single" />
     </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,6 +163,9 @@ 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

@@ -191,7 +191,7 @@
             <ButtonWithTooltip
                 label={i18n._('toolbar.routing.reverse.tooltip')}
                 variant="outline"
-                class="gap-1 text-xs"
+                class="gap-1 text-xs px-1.5 py-1.5 h-fit"
                 disabled={!validSelection}
                 onclick={fileActions.reverseSelection}
             >
@@ -200,7 +200,7 @@
             <ButtonWithTooltip
                 label={i18n._('toolbar.routing.route_back_to_start.tooltip')}
                 variant="outline"
-                class="gap-1 text-xs"
+                class="gap-1 text-xs px-1.5 py-1.5 h-fit"
                 disabled={!validSelection}
                 onclick={() => {
                     const selected = selection.getOrderedSelection();
@@ -236,14 +236,14 @@
             <ButtonWithTooltip
                 label={i18n._('toolbar.routing.round_trip.tooltip')}
                 variant="outline"
-                class="gap-1 text-xs"
+                class="gap-1 text-xs px-1.5 py-1.5 h-fit"
                 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-2 items-end justify-between">
+        <div class="w-full flex flex-row gap-1 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

@@ -57,8 +57,10 @@ export class RoutingControls {
 
     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);
     onMouseEnterBinded: () => void = this.onMouseEnter.bind(this);
     onMouseLeaveBinded: () => void = this.onMouseLeave.bind(this);
@@ -85,7 +87,7 @@ export class RoutingControls {
         this.file = file;
         for (let zoom = MIN_ANCHOR_ZOOM; zoom <= MAX_ANCHOR_ZOOM; zoom++) {
             this.layers.set(zoom, {
-                id: `routing-controls-${zoom}`,
+                id: `routing-controls-${this.fileId}-${zoom}`,
                 anchors: [],
             });
         }
@@ -133,6 +135,7 @@ 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);
     }
@@ -237,6 +240,7 @@ 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) => {
@@ -521,12 +525,19 @@ export class RoutingControls {
         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.layers.values()].map((layer) => layer.id),
+                layers: [this.fileId, ...[...this.layers.values()].map((layer) => layer.id)],
             }).length
         ) {
-            // Clicked on routing control, ignoring
+            // Clicked on routing control or layer, ignoring
             return;
         }
         this.appendAnchorWithCoordinates({
@@ -598,6 +609,15 @@ export class RoutingControls {
         await this.routeBetweenAnchors([lastAnchor, newAnchor], [lastAnchorPoint, newAnchorPoint]);
     }
 
+    addIntermediateAnchor(e: maplibregl.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;
@@ -800,7 +820,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 ? 50 : 80
+            _map.getCanvasContainer().offsetWidth > 1000 ? 56 : 80
         );
     }
 
@@ -818,8 +838,11 @@ export class RoutingControls {
     onClick(e: MapLayerMouseEvent) {
         e.preventDefault();
 
-        if (this.temporaryAnchor !== null) {
+        if (
-            this.turnIntoPermanentAnchor();
+            this.draggedAnchorIndex !== null ||
+            Date.now() - this.lastDraggedAnchorEventTime < 100
+        ) {
+            // Exit if anchor is being dragged
             return;
         }
 
@@ -908,6 +931,8 @@ export class RoutingControls {
             lat: e.lngLat.lat,
             lon: e.lngLat.lng,
         });
+
+        this.lastDraggedAnchorEventTime = Date.now();
     }
 
     onMouseUp(e: MapLayerMouseEvent | MapLayerTouchEvent) {
@@ -946,6 +971,7 @@ export class RoutingControls {
         }
 
         this.draggedAnchorIndex = null;
+        this.lastDraggedAnchorEventTime = Date.now();
     }
 
     showTemporaryAnchor(e: MapLayerMouseEvent) {
@@ -1073,7 +1099,9 @@ export class RoutingControls {
         if (!this.temporaryAnchor) {
             return;
         }
-        let source = get(map)?.getSource('routing-controls-0') as GeoJSONSource | undefined;
+        let source = get(map)?.getSource(`routing-controls-${this.fileId}-0`) as
+            | GeoJSONSource
+            | undefined;
         if (source) {
             if (this.temporaryAnchor) {
                 source.updateData({
@@ -1088,7 +1116,9 @@ export class RoutingControls {
             return;
         }
         const map_ = get(map);
-        let source = map_?.getSource('routing-controls-0') as GeoJSONSource | undefined;
+        let source = map_?.getSource(`routing-controls-${this.fileId}-0`) as
+            | GeoJSONSource
+            | undefined;
         if (source) {
             if (this.temporaryAnchor) {
                 source.updateData({

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

@@ -161,66 +161,73 @@
 </script>
 
 <div class="flex flex-col gap-3 w-full max-w-96 {props.class ?? ''}">
-    <fieldset class="flex flex-col gap-2">
+    <fieldset class="flex flex-col gap-1.5">
-        <Label for="name">{i18n._('menu.metadata.name')}</Label>
+        <div class="flex flex-col gap-1">
-        <Input
+            <Label for="name">{i18n._('menu.metadata.name')}</Label>
-            bind:value={name}
+            <Input
-            id="name"
+                bind:value={name}
-            class="font-semibold h-8"
+                id="name"
-            disabled={!canCreate && !$selectedWaypoint}
+                class="font-semibold"
-        />
-        <Label for="description">{i18n._('menu.metadata.description')}</Label>
-        <Textarea
-            bind:value={description}
-            id="description"
-            disabled={!canCreate && !$selectedWaypoint}
-            class="min-h-8 h-8 py-1 px-3 text-sm"
-        />
-        <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}
-            >
+            />
-                <span class="flex flex-row gap-1.5 items-center">
+        </div>
-                    {#if symbolKey}
+        <div class="flex flex-col gap-1">
-                        {#if symbols[symbolKey].icon}
+            <Label for="description">{i18n._('menu.metadata.description')}</Label>
-                            {@const Component = symbols[symbolKey].icon}
+            <Textarea
-                            <Component size="14" />
+                bind:value={description}
-                        {/if}
+                id="description"
-                        {i18n._(`gpx.symbol.${symbolKey}`)}
+                disabled={!canCreate && !$selectedWaypoint}
-                    {:else}
+                class="min-h-8 h-8 py-1 px-3 text-sm"
-                        {sym}
+            />
-                    {/if}
+        </div>
-                </span>
+        <div class="flex flex-col gap-1">
-            </Select.Trigger>
+            <Label for="symbol">{i18n._('toolbar.waypoint.icon')}</Label>
-            <Select.Content class="max-h-60 overflow-y-scroll">
+            <Select.Root bind:value={sym} type="single">
-                {#each sortedSymbols as [key, symbol]}
+                <Select.Trigger
-                    <Select.Item value={symbol.value}>
+                    id="symbol"
-                        <span>
+                    class="w-full"
-                            {#if symbol.icon}
+                    disabled={!canCreate && !$selectedWaypoint}
-                                {@const Component = symbol.icon}
+                >
-                                <Component size="14" class="inline-block align-sub" />
+                    <span class="flex flex-row gap-1.5 items-center">
-                            {:else}
+                        {#if symbolKey}
-                                <span class="w-4 inline-block"></span>
+                            {#if symbols[symbolKey].icon}
+                                {@const Component = symbols[symbolKey].icon}
+                                <Component size="14" />
                             {/if}
-                            {i18n._(`gpx.symbol.${key}`)}
+                            {i18n._(`gpx.symbol.${symbolKey}`)}
-                        </span>
+                        {:else}
-                    </Select.Item>
+                            {sym}
-                {/each}
+                        {/if}
-            </Select.Content>
+                    </span>
-        </Select.Root>
+                </Select.Trigger>
-        <Label for="link">{i18n._('toolbar.waypoint.link')}</Label>
+                <Select.Content class="max-h-60">
-        <Input
+                    {#each sortedSymbols as [key, symbol]}
-            bind:value={link}
+                        <Select.Item value={symbol.value}>
-            id="link"
+                            <span>
-            class="h-8"
+                                {#if symbol.icon}
-            disabled={!canCreate && !$selectedWaypoint}
+                                    {@const Component = symbol.icon}
-        />
+                                    <Component size="14" class="inline-block align-sub" />
-        <div class="flex flex-row gap-2">
+                                {:else}
-            <div class="grow flex flex-col gap-2">
+                                    <span class="w-4 inline-block"></span>
+                                {/if}
+                                {i18n._(`gpx.symbol.${key}`)}
+                            </span>
+                        </Select.Item>
+                    {/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}
+                id="link"
+                class="h-8"
+                disabled={!canCreate && !$selectedWaypoint}
+            />
+        </div>
+        <div class="flex flex-row gap-1.5">
+            <div class="grow flex flex-col gap-1">
                 <Label for="latitude">{i18n._('toolbar.waypoint.latitude')}</Label>
                 <Input
                     bind:value={latitude}
@@ -233,7 +240,7 @@
                     disabled={!canCreate && !$selectedWaypoint}
                 />
             </div>
-            <div class="grow flex flex-col gap-2">
+            <div class="grow flex flex-col gap-1">
                 <Label for="longitude">{i18n._('toolbar.waypoint.longitude')}</Label>
                 <Input
                     bind:value={longitude}
@@ -248,11 +255,11 @@
             </div>
         </div>
     </fieldset>
-    <div class="flex flex-row gap-2 items-center">
+    <div class="flex flex-row gap-1.5 items-center">
         <Button
             variant="outline"
             disabled={!canCreate && !$selectedWaypoint}
-            class="grow whitespace-normal h-fit"
+            class="grow shrink h-fit min-h-8 whitespace-normal py-1"
             onclick={createOrUpdateWaypoint}
         >
             {#if $selectedWaypoint}

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

@@ -13,10 +13,15 @@
 <AccordionPrimitive.Content
 	bind:ref
 	data-slot="accordion-content"
-	class="data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down overflow-hidden text-sm"
+	class="data-open:animate-accordion-down data-closed:animate-accordion-up text-sm overflow-hidden"
 	{...restProps}
 >
-	<div class={cn("pb-4 pt-0", className)}>
+	<div
+		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("border-b last:border-b-0", className)}
+	class={cn("not-last:border-b", className)}
 	{...restProps}
 />

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

@@ -1,7 +1,8 @@
 <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),
@@ -19,14 +20,13 @@
 		data-slot="accordion-trigger"
 		bind:ref
 		class={cn(
-			"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",
+			"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",
 			className
 		)}
 		{...restProps}
 	>
 		{@render children?.()}
-		<ChevronDownIcon
+		<ChevronDownIcon data-slot="accordion-trigger-icon" class="cn-accordion-trigger-icon pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden" />
-			class="text-muted-foreground pointer-events-none size-4 shrink-0 translate-y-0.5 transition-transform duration-200"
+		<ChevronUpIcon data-slot="accordion-trigger-icon" class="cn-accordion-trigger-icon pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline" />
-		/>
 	</AccordionPrimitive.Trigger>
 </AccordionPrimitive.Header>

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

@@ -1,9 +1,11 @@
 <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>
@@ -12,5 +14,6 @@
 	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,18 +1,27 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
-	import { buttonVariants } from "$lib/components/ui/button/index.js";
+	import {
+		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 = $props();
+	}: AlertDialogPrimitive.ActionProps & {
+		variant?: ButtonVariant;
+		size?: ButtonSize;
+	} = $props();
 </script>
 
 <AlertDialogPrimitive.Action
 	bind:ref
 	data-slot="alert-dialog-action"
-	class={cn(buttonVariants(), className)}
+	class={cn(buttonVariants({ variant, size }), "cn-alert-dialog-action", className)}
 	{...restProps}
 />

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

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

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

@@ -1,27 +1,32 @@
 <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> & {
-		portalProps?: WithoutChildrenOrChild<AlertDialogPrimitive.PortalProps>;
+		size?: "default" | "sm";
+		portalProps?: WithoutChildrenOrChild<ComponentProps<typeof AlertDialogPortal>>;
 	} = $props();
 </script>
 
-<AlertDialogPrimitive.Portal {...portalProps}>
+<AlertDialogPortal {...portalProps}>
 	<AlertDialogOverlay />
 	<AlertDialogPrimitive.Content
 		bind:ref
 		data-slot="alert-dialog-content"
+		data-size={size}
 		class={cn(
-			"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",
+			"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",
 			className
 		)}
 		{...restProps}
 	/>
-</AlertDialogPrimitive.Portal>
+</AlertDialogPortal>

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 text-sm", className)}
+	class={cn("text-muted-foreground *:[a]:hover:text-foreground text-sm text-balance md:text-pretty *:[a]:underline *:[a]:underline-offset-3", className)}
 	{...restProps}
 />

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

@@ -13,7 +13,10 @@
 <div
 	bind:this={ref}
 	data-slot="alert-dialog-footer"
-	class={cn("flex flex-col-reverse gap-2 sm:flex-row sm:justify-end", className)}
+	class={cn(
+		"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("flex flex-col gap-2 text-center sm:text-left", className)}
+	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)}
 	{...restProps}
 >
 	{@render children?.()}

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

@@ -0,0 +1,20 @@
+<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,9 +12,6 @@
 <AlertDialogPrimitive.Overlay
 	bind:ref
 	data-slot="alert-dialog-overlay"
-	class={cn(
+	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)}
-		"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,9 +1,7 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
 
-	type $$Props = AlertDialogPrimitive.PortalProps;
+	let { ...restProps }: AlertDialogPrimitive.PortalProps = $props();
 </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-lg font-semibold", className)}
+	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)}
 	{...restProps}
 />

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

@@ -0,0 +1,7 @@
+<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,4 +1,5 @@
-import { AlertDialog as AlertDialogPrimitive } from "bits-ui";
+import Root from "./alert-dialog.svelte";
+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";
@@ -8,9 +9,7 @@ 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,
@@ -24,6 +23,7 @@ export {
 	Overlay,
 	Content,
 	Description,
+	Media,
 	//
 	Root as AlertDialog,
 	Title as AlertDialogTitle,
@@ -36,4 +36,5 @@ export {
 	Overlay as AlertDialogOverlay,
 	Content as AlertDialogContent,
 	Description as AlertDialogDescription,
+	Media as AlertDialogMedia,
 };

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

@@ -0,0 +1,20 @@
+<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 col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed",
+		"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",
 		className
 	)}
 	{...restProps}

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

@@ -13,7 +13,10 @@
 <div
 	bind:this={ref}
 	data-slot="alert-title"
-	class={cn("col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight", className)}
+	class={cn(
+		"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,12 +2,11 @@
 	import { type VariantProps, tv } from "tailwind-variants";
 
 	export const alertVariants = tv({
-		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",
+		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",
 		variants: {
 			variant: {
 				default: "bg-card text-card-foreground",
-				destructive:
+				destructive: "text-destructive bg-card *:data-[slot=alert-description]:text-destructive/90 *:[svg]:text-current",
-					"text-destructive bg-card *:data-[slot=alert-description]:text-destructive/90 [&>svg]:text-current",
 			},
 		},
 		defaultVariants: {
@@ -36,9 +35,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,14 +1,17 @@
 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 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",
+		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",
 		variants: {
 			variant: {
-				default: "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
+				default: "bg-primary text-primary-foreground [a]:hover:bg-primary/80",
-				destructive:
+				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",
-					"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",
+				secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80 aria-expanded:bg-secondary aria-expanded:text-secondary-foreground",
-				outline:
+				ghost: "hover:bg-muted hover:text-foreground dark:hover:bg-muted/50 aria-expanded:bg-muted aria-expanded:text-foreground",
-					"bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border",
+				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",
-				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-9 px-4 py-2 has-[>svg]:px-3",
+				default: "h-8 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
-				sm: "h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5",
+				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",
-				lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
+				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",
-				icon: "size-9",
+				lg: "h-9 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
-				"icon-sm": "size-8",
+				icon: "size-8",
-				"icon-lg": "size-10",
+				"icon-xs": "size-6 rounded-[min(var(--radius-md),10px)] in-data-[slot=button-group]:rounded-lg [&_svg:not([class*='size-'])]:size-3",
+				"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(
-		"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",
+		"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)",
 		className
 	)}
 	{...restProps}

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

@@ -1,5 +1,4 @@
 <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";
 
@@ -13,18 +12,17 @@
 <CalendarPrimitive.Day
 	bind:ref
 	class={cn(
-		buttonVariants({ variant: "ghost" }),
+		"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",
-		"size-(--cell-size) flex select-none flex-col items-center justify-center gap-1 whitespace-nowrap p-0 font-normal leading-none",
+		"[&:last-child[data-selected=true]_button]:rounded-r-(--cell-radius)",
+		"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 dark:data-[selected]:hover:bg-accent/50 data-[selected]:text-primary-foreground",
+		"data-[selected]:bg-primary data-[selected]:text-primary-foreground data-[selected]:hover:text-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("mt-4 flex w-full border-collapse flex-col gap-1", className)}
+	class={cn("flex w-full border-collapse flex-col", className)}
 	{...restProps}
 />

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

@@ -12,7 +12,7 @@
 <CalendarPrimitive.Header
 	bind:ref
 	class={cn(
-		"h-(--cell-size) flex w-full items-center justify-center gap-1.5 text-sm font-medium",
+		"flex h-(--cell-size) 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,11 +14,15 @@
 
 <span
 	class={cn(
-		"has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative flex rounded-md border",
+		"has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]",
 		className
 	)}
 >
-	<CalendarPrimitive.MonthSelect bind:ref class="absolute inset-0 opacity-0" {...restProps}>
+	<CalendarPrimitive.MonthSelect
+		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)}
@@ -33,7 +37,7 @@
 				{/each}
 			</select>
 			<span
-				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"
+				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"
 				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 flex-col", className)}>
+<div {...restProps} bind:this={ref} class={cn("flex w-full flex-col gap-4", className)}>
 	{@render children?.()}
 </div>

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

@@ -23,9 +23,14 @@
 	bind:ref
 	class={cn(
 		buttonVariants({ variant }),
-		"size-(--cell-size) select-none bg-transparent p-0 disabled:opacity-50 rtl:rotate-180",
+		"size-(--cell-size) bg-transparent p-0 select-none 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,9 +23,14 @@
 	bind:ref
 	class={cn(
 		buttonVariants({ variant }),
-		"size-(--cell-size) select-none bg-transparent p-0 disabled:opacity-50 rtl:rotate-180",
+		"size-(--cell-size) bg-transparent p-0 select-none 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,11 +13,15 @@
 
 <span
 	class={cn(
-		"has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative flex rounded-md border",
+		"has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]",
 		className
 	)}
 >
-	<CalendarPrimitive.YearSelect bind:ref class="absolute inset-0 opacity-0" {...restProps}>
+	<CalendarPrimitive.YearSelect
+		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)}
@@ -32,7 +36,7 @@
 				{/each}
 			</select>
 			<span
-				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"
+				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"
 				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(
-		"bg-background group/calendar p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
+		"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",
 		className
 	)}
 	{locale}

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

@@ -13,7 +13,10 @@
 <div
 	bind:this={ref}
 	data-slot="card-action"
-	class={cn("col-start-2 row-span-2 row-start-1 self-start justify-self-end", className)}
+	class={cn(
+		"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,6 +10,11 @@
 	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
 </script>
 
-<div bind:this={ref} data-slot="card-content" class={cn("px-6", className)} {...restProps}>
+<div
+	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("[.border-t]:pt-6 flex items-center px-6", className)}
+	class={cn("bg-muted/50 rounded-b-xl border-t p-4 group-data-[size=sm]/card:p-3 flex items-center", 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(
-		"@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",
+		"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]",
 		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("font-semibold leading-none", className)}
+	class={cn("text-base leading-snug font-medium group-data-[size=sm]/card:text-sm", className)}
 	{...restProps}
 >
 	{@render children?.()}

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

@@ -6,17 +6,16 @@
 		ref = $bindable(null),
 		class: className,
 		children,
+		size = "default",
 		...restProps
-	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & { size?: "default" | "sm" } = $props();
 </script>
 
 <div
 	bind:this={ref}
 	data-slot="card"
-	class={cn(
+	data-size={size}
-		"bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
+	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)}
-		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-[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",
+		"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",
 		className
 	)}
 	bind:checked
@@ -25,11 +25,14 @@
 	{...restProps}
 >
 	{#snippet children({ checked, indeterminate })}
-		<div data-slot="checkbox-indicator" class="text-current transition-none">
+		<div
+			data-slot="checkbox-indicator"
+			class="[&>svg]:size-3.5 grid place-content-center text-current transition-none"
+		>
 			{#if checked}
-				<CheckIcon class="size-3.5" />
+				<CheckIcon  />
 			{:else if indeterminate}
-				<MinusIcon class="size-3.5" />
+				<MinusIcon  />
 			{/if}
 		</div>
 	{/snippet}

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

@@ -1,17 +1,19 @@
 <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>
@@ -21,16 +23,17 @@
 	bind:checked
 	bind:indeterminate
 	data-slot="context-menu-checkbox-item"
+	data-inset={inset}
 	class={cn(
-		"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",
+		"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",
 		className
 	)}
 	{...restProps}
 >
 	{#snippet children({ checked })}
-		<span class="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+		<span class="absolute right-2 pointer-events-none">
 			{#if checked}
-				<CheckIcon class="size-4" />
+				<CheckIcon  />
 			{/if}
 		</span>
 		{@render childrenProp?.()}

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

@@ -1,6 +1,9 @@
 <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),
@@ -8,18 +11,18 @@
 		class: className,
 		...restProps
 	}: ContextMenuPrimitive.ContentProps & {
-		portalProps?: ContextMenuPrimitive.PortalProps;
+		portalProps?: WithoutChildrenOrChild<ComponentProps<typeof ContextMenuPortal>>;
 	} = $props();
 </script>
 
-<ContextMenuPrimitive.Portal {...portalProps}>
+<ContextMenuPortal {...portalProps}>
 	<ContextMenuPrimitive.Content
 		bind:ref
 		data-slot="context-menu-content"
 		class={cn(
-			"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",
+			"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",
 			className
 		)}
 		{...restProps}
 	/>
-</ContextMenuPrimitive.Portal>
+</ContextMenuPortal>

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]:pl-8", className)}
+	class={cn("text-foreground px-2 py-1.5 text-sm font-medium data-inset:ps-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(
-		"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",
+		"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",
 		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-foreground px-2 py-1.5 text-sm font-medium data-[inset]:pl-8", className)}
+	class={cn("text-muted-foreground px-1.5 py-1 text-xs font-medium data-inset:pl-7 data-inset:pl-8", className)}
 	{...restProps}
 >
 	{@render children?.()}

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

@@ -0,0 +1,7 @@
+<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,29 +1,33 @@
 <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> = $props();
+	}: WithoutChild<ContextMenuPrimitive.RadioItemProps> & {
+		inset?: boolean;
+	} = $props();
 </script>
 
 <ContextMenuPrimitive.RadioItem
 	bind:ref
 	data-slot="context-menu-radio-item"
+	data-inset={inset}
 	class={cn(
-		"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",
+		"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",
 		className
 	)}
 	{...restProps}
 >
 	{#snippet children({ checked })}
-		<span class="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+		<span class="absolute right-2 pointer-events-none">
 			{#if checked}
-				<CircleIcon class="size-2 fill-current" />
+				<CheckIcon  />
 			{/if}
 		</span>
 		{@render childrenProp?.({ checked })}

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

@@ -13,7 +13,7 @@
 <span
 	bind:this={ref}
 	data-slot="context-menu-shortcut"
-	class={cn("text-muted-foreground ml-auto text-xs tracking-widest", className)}
+	class={cn("text-muted-foreground group-focus/context-menu-item:text-accent-foreground ml-auto text-xs tracking-widest", className)}
 	{...restProps}
 >
 	{@render children?.()}

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

@@ -12,9 +12,6 @@
 <ContextMenuPrimitive.SubContent
 	bind:ref
 	data-slot="context-menu-sub-content"
-	class={cn(
+	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 bg-popover text-popover-foreground min-w-32 rounded-lg border p-1 shadow-lg duration-100", className)}
-		"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 origin-(--bits-context-menu-content-transform-origin) z-50 min-w-[8rem] overflow-hidden rounded-md border p-1 shadow-lg",
-		className
-	)}
 	{...restProps}
 />

website/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from "bits-ui";
-	import ChevronRightIcon from "@lucide/svelte/icons/chevron-right";
 	import { cn, type WithoutChild } from "$lib/utils.js";
+	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
 
 	let {
 		ref = $bindable(null),
@@ -19,7 +19,7 @@
 	data-slot="context-menu-sub-trigger"
 	data-inset={inset}
 	class={cn(
-		"data-highlighted:bg-accent data-highlighted:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground outline-hidden [&_svg:not([class*='text-'])]:text-muted-foreground 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",
+		"focus:bg-accent focus:text-accent-foreground data-open:bg-accent data-open: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 flex cursor-default items-center outline-hidden select-none data-inset:ps-8 [&_svg]:pointer-events-none [&_svg]:shrink-0",
 		className
 	)}
 	{...restProps}

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

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

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

@@ -1,7 +1,17 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
 
-	let { ref = $bindable(null), ...restProps }: ContextMenuPrimitive.TriggerProps = $props();
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: ContextMenuPrimitive.TriggerProps = $props();
 </script>
 
-<ContextMenuPrimitive.Trigger bind:ref data-slot="context-menu-trigger" {...restProps} />
+<ContextMenuPrimitive.Trigger
+	bind:ref
+	data-slot="context-menu-trigger"
+	class={cn("cn-context-menu-trigger select-none", className)}
+	{...restProps}
+/>

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

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

website/src/lib/components/ui/context-menu/index.ts

@@ -1,5 +1,6 @@
-import { ContextMenu as ContextMenuPrimitive } from "bits-ui";
+import Root from "./context-menu.svelte";
-
+import Sub from "./context-menu-sub.svelte";
+import Portal from "./context-menu-portal.svelte";
 import Trigger from "./context-menu-trigger.svelte";
 import Group from "./context-menu-group.svelte";
 import RadioGroup from "./context-menu-radio-group.svelte";
@@ -13,12 +14,11 @@ import SubContent from "./context-menu-sub-content.svelte";
 import SubTrigger from "./context-menu-sub-trigger.svelte";
 import CheckboxItem from "./context-menu-checkbox-item.svelte";
 import Label from "./context-menu-label.svelte";
-const Sub = ContextMenuPrimitive.Sub;
-const Root = ContextMenuPrimitive.Root;
 
 export {
-	Sub,
 	Root,
+	Sub,
+	Portal,
 	Item,
 	GroupHeading,
 	Label,
@@ -35,6 +35,7 @@ export {
 	//
 	Root as ContextMenu,
 	Sub as ContextMenuSub,
+	Portal as ContextMenuPortal,
 	Item as ContextMenuItem,
 	GroupHeading as ContextMenuGroupHeading,
 	Group as ContextMenuGroup,

website/src/lib/components/ui/date-picker/DatePicker.svelte

@@ -22,9 +22,9 @@
         onchange?: (date: DateValue | undefined) => void;
     } = $props();
 
-    const df = new DateFormatter(locale, {
+    const df = $derived(new DateFormatter(locale, {
         dateStyle: 'long',
-    });
+    }));
 
     let contentRef = $state<HTMLElement | null>(null);
 </script>

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

@@ -1,7 +1,11 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from "bits-ui";
 
-	let { ref = $bindable(null), ...restProps }: DialogPrimitive.CloseProps = $props();
+	let {
+		ref = $bindable(null),
+		type = "button",
+		...restProps
+	}: DialogPrimitive.CloseProps = $props();
 </script>
 
-<DialogPrimitive.Close bind:ref data-slot="dialog-close" {...restProps} />
+<DialogPrimitive.Close bind:ref data-slot="dialog-close" {type} {...restProps} />

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

@@ -1,9 +1,12 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from "bits-ui";
-	import XIcon from "@lucide/svelte/icons/x";
+	import DialogPortal from "./dialog-portal.svelte";
 	import type { Snippet } from "svelte";
 	import * as Dialog from "./index.js";
 	import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
+	import type { ComponentProps } from "svelte";
+	import { Button } from "$lib/components/ui/button/index.js";
+	import XIcon from '@lucide/svelte/icons/x';
 
 	let {
 		ref = $bindable(null),
@@ -13,31 +16,33 @@
 		showCloseButton = true,
 		...restProps
 	}: WithoutChildrenOrChild<DialogPrimitive.ContentProps> & {
-		portalProps?: DialogPrimitive.PortalProps;
+		portalProps?: WithoutChildrenOrChild<ComponentProps<typeof DialogPortal>>;
 		children: Snippet;
 		showCloseButton?: boolean;
 	} = $props();
 </script>
 
-<Dialog.Portal {...portalProps}>
+<DialogPortal {...portalProps}>
 	<Dialog.Overlay />
 	<DialogPrimitive.Content
 		bind:ref
 		data-slot="dialog-content"
 		class={cn(
-			"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",
+			"bg-popover text-popover-foreground 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 ring-foreground/10 grid max-w-[calc(100%-2rem)] gap-4 rounded-xl p-4 text-sm ring-1 duration-100 sm:max-w-sm fixed top-1/2 left-1/2 z-50 w-full -translate-x-1/2 -translate-y-1/2 outline-none",
 			className
 		)}
 		{...restProps}
 	>
 		{@render children?.()}
 		{#if showCloseButton}
-			<DialogPrimitive.Close
+			<DialogPrimitive.Close data-slot="dialog-close">
-				class="ring-offset-background focus:ring-ring rounded-xs focus:outline-hidden absolute end-4 top-4 opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0"
+				{#snippet child({ props })}
-			>
+					<Button variant="ghost" class="absolute top-2 right-2" size="icon-sm" {...props}>
-				<XIcon />
+						<XIcon  />
-				<span class="sr-only">Close</span>
+						<span class="sr-only">Close</span>
+					</Button>
+				{/snippet}
 			</DialogPrimitive.Close>
 		{/if}
 	</DialogPrimitive.Content>
-</Dialog.Portal>
+</DialogPortal>

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

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

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

@@ -1,20 +1,32 @@
 <script lang="ts">
 	import { cn, type WithElementRef } from "$lib/utils.js";
 	import type { HTMLAttributes } from "svelte/elements";
+	import { Dialog as DialogPrimitive } from "bits-ui";
+	import { Button } from "$lib/components/ui/button/index.js";
 
 	let {
 		ref = $bindable(null),
 		class: className,
 		children,
+		showCloseButton = false,
 		...restProps
-	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & {
+		showCloseButton?: boolean;
+	} = $props();
 </script>
 
 <div
 	bind:this={ref}
 	data-slot="dialog-footer"
-	class={cn("flex flex-col-reverse gap-2 sm:flex-row sm:justify-end", className)}
+	class={cn("bg-muted/50 -mx-4 -mb-4 rounded-b-xl border-t p-4 flex flex-col-reverse gap-2 sm:flex-row sm:justify-end", className)}
 	{...restProps}
 >
 	{@render children?.()}
+	{#if showCloseButton}
+		<DialogPrimitive.Close>
+			{#snippet child({ props })}
+				<Button variant="outline" {...props}>Close</Button>
+			{/snippet}
+		</DialogPrimitive.Close>
+	{/if}
 </div>

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

@@ -13,7 +13,7 @@
 <div
 	bind:this={ref}
 	data-slot="dialog-header"
-	class={cn("flex flex-col gap-2 text-center sm:text-left", className)}
+	class={cn("gap-2 flex flex-col", className)}
 	{...restProps}
 >
 	{@render children?.()}

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

@@ -12,9 +12,6 @@
 <DialogPrimitive.Overlay
 	bind:ref
 	data-slot="dialog-overlay"
-	class={cn(
+	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 isolate z-50", className)}
-		"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/dialog/dialog-portal.svelte

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

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

@@ -12,6 +12,6 @@
 <DialogPrimitive.Title
 	bind:ref
 	data-slot="dialog-title"
-	class={cn("text-lg font-semibold leading-none", className)}
+	class={cn("text-base leading-none font-medium", className)}
 	{...restProps}
 />

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

@@ -1,7 +1,11 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from "bits-ui";
 
-	let { ref = $bindable(null), ...restProps }: DialogPrimitive.TriggerProps = $props();
+	let {
+		ref = $bindable(null),
+		type = "button",
+		...restProps
+	}: DialogPrimitive.TriggerProps = $props();
 </script>
 
-<DialogPrimitive.Trigger bind:ref data-slot="dialog-trigger" {...restProps} />
+<DialogPrimitive.Trigger bind:ref data-slot="dialog-trigger" {type} {...restProps} />