diff --git a/ui/src/components/ActionList.svelte b/ui/src/lib/components/ActionList.svelte
similarity index 97%
rename from ui/src/components/ActionList.svelte
rename to ui/src/lib/components/ActionList.svelte
index 046a4a9..6f4e208 100644
--- a/ui/src/components/ActionList.svelte
+++ b/ui/src/lib/components/ActionList.svelte
@@ -7,7 +7,7 @@
      Spinner,
  } from 'sveltestrap';
 
- import { actions } from '../stores/actions';
+ import { actions } from '$lib/stores/actions';
 
  export let flush = false;
 
diff --git a/ui/src/components/AlarmExceptionList.svelte b/ui/src/lib/components/AlarmExceptionList.svelte
similarity index 92%
rename from ui/src/components/AlarmExceptionList.svelte
rename to ui/src/lib/components/AlarmExceptionList.svelte
index f12004d..aac62f0 100644
--- a/ui/src/components/AlarmExceptionList.svelte
+++ b/ui/src/lib/components/AlarmExceptionList.svelte
@@ -7,8 +7,8 @@
      Spinner,
  } from 'sveltestrap';
 
- import DateRangeFormat from '../components/DateRangeFormat.svelte';
- import { alarmsExceptions } from '../stores/alarmexceptions';
+ import DateRangeFormat from '$lib/components/DateRangeFormat.svelte';
+ import { alarmsExceptions } from '$lib/stores/alarmexceptions';
 
  export let flush = false;
 </script>
diff --git a/ui/src/components/AlarmRepeatedList.svelte b/ui/src/lib/components/AlarmRepeatedList.svelte
similarity index 93%
rename from ui/src/components/AlarmRepeatedList.svelte
rename to ui/src/lib/components/AlarmRepeatedList.svelte
index df7faa8..a1c93cf 100644
--- a/ui/src/components/AlarmRepeatedList.svelte
+++ b/ui/src/lib/components/AlarmRepeatedList.svelte
@@ -7,8 +7,8 @@
      Spinner,
  } from 'sveltestrap';
 
- import { weekdayStr } from '../lib/alarmrepeated';
- import { alarmsRepeated } from '../stores/alarmrepeated';
+ import { weekdayStr } from '$lib/alarmrepeated';
+ import { alarmsRepeated } from '$lib/stores/alarmrepeated';
 
  export let flush = false;
 </script>
diff --git a/ui/src/components/AlarmSingleList.svelte b/ui/src/lib/components/AlarmSingleList.svelte
similarity index 93%
rename from ui/src/components/AlarmSingleList.svelte
rename to ui/src/lib/components/AlarmSingleList.svelte
index 095670b..acd3b23 100644
--- a/ui/src/components/AlarmSingleList.svelte
+++ b/ui/src/lib/components/AlarmSingleList.svelte
@@ -7,8 +7,8 @@
      Spinner,
  } from 'sveltestrap';
 
- import DateFormat from '../components/DateFormat.svelte';
- import { alarmsSingle } from '../stores/alarmsingle';
+ import DateFormat from '$lib/components/DateFormat.svelte';
+ import { alarmsSingle } from '$lib/stores/alarmsingle';
 
  export let flush = false;
 </script>
diff --git a/ui/src/components/CardRoutine.svelte b/ui/src/lib/components/CardRoutine.svelte
similarity index 96%
rename from ui/src/components/CardRoutine.svelte
rename to ui/src/lib/components/CardRoutine.svelte
index b0c252d..cc63566 100644
--- a/ui/src/components/CardRoutine.svelte
+++ b/ui/src/lib/components/CardRoutine.svelte
@@ -13,7 +13,7 @@
      Icon,
  } from 'sveltestrap';
 
- import { actions_idx } from '../stores/actions';
+ import { actions_idx } from '$lib/stores/actions';
 
  export let routine = {
      name: "Classique",
diff --git a/ui/src/components/CardStatAlarms.svelte b/ui/src/lib/components/CardStatAlarms.svelte
similarity index 100%
rename from ui/src/components/CardStatAlarms.svelte
rename to ui/src/lib/components/CardStatAlarms.svelte
diff --git a/ui/src/components/CardStatRoutines.svelte b/ui/src/lib/components/CardStatRoutines.svelte
similarity index 100%
rename from ui/src/components/CardStatRoutines.svelte
rename to ui/src/lib/components/CardStatRoutines.svelte
diff --git a/ui/src/components/CardStatTimeAwaking.svelte b/ui/src/lib/components/CardStatTimeAwaking.svelte
similarity index 100%
rename from ui/src/components/CardStatTimeAwaking.svelte
rename to ui/src/lib/components/CardStatTimeAwaking.svelte
diff --git a/ui/src/components/CycleCounter.svelte b/ui/src/lib/components/CycleCounter.svelte
similarity index 100%
rename from ui/src/components/CycleCounter.svelte
rename to ui/src/lib/components/CycleCounter.svelte
diff --git a/ui/src/components/DateFormat.svelte b/ui/src/lib/components/DateFormat.svelte
similarity index 100%
rename from ui/src/components/DateFormat.svelte
rename to ui/src/lib/components/DateFormat.svelte
diff --git a/ui/src/components/DateRangeFormat.svelte b/ui/src/lib/components/DateRangeFormat.svelte
similarity index 100%
rename from ui/src/components/DateRangeFormat.svelte
rename to ui/src/lib/components/DateRangeFormat.svelte
diff --git a/ui/src/components/DateTimeInput.svelte b/ui/src/lib/components/DateTimeInput.svelte
similarity index 100%
rename from ui/src/components/DateTimeInput.svelte
rename to ui/src/lib/components/DateTimeInput.svelte
diff --git a/ui/src/components/GongsList.svelte b/ui/src/lib/components/GongsList.svelte
similarity index 98%
rename from ui/src/components/GongsList.svelte
rename to ui/src/lib/components/GongsList.svelte
index 3ba4e7c..06777e7 100644
--- a/ui/src/components/GongsList.svelte
+++ b/ui/src/lib/components/GongsList.svelte
@@ -8,7 +8,7 @@
      Spinner,
  } from 'sveltestrap';
 
- import { gongs } from '../stores/gongs';
+ import { gongs } from '$lib/stores/gongs';
 
  function chooseGong(gong) {
      gong.setDefault().then(() => {
diff --git a/ui/src/components/Header.svelte b/ui/src/lib/components/Header.svelte
similarity index 100%
rename from ui/src/components/Header.svelte
rename to ui/src/lib/components/Header.svelte
diff --git a/ui/src/components/MusiksLastPlayedList.svelte b/ui/src/lib/components/MusiksLastPlayedList.svelte
similarity index 100%
rename from ui/src/components/MusiksLastPlayedList.svelte
rename to ui/src/lib/components/MusiksLastPlayedList.svelte
diff --git a/ui/src/components/Toaster.svelte b/ui/src/lib/components/Toaster.svelte
similarity index 90%
rename from ui/src/components/Toaster.svelte
rename to ui/src/lib/components/Toaster.svelte
index af00200..d0d9c46 100644
--- a/ui/src/components/Toaster.svelte
+++ b/ui/src/lib/components/Toaster.svelte
@@ -5,7 +5,7 @@
      ToastHeader,
  } from 'sveltestrap';
 
- import { ToastsStore } from '../stores/toasts';
+ import { ToastsStore } from '$lib/stores/toasts';
 </script>
 
 <div class="toast-container position-absolute top-0 end-0 p-3">
diff --git a/ui/src/components/TrackList.svelte b/ui/src/lib/components/TrackList.svelte
similarity index 98%
rename from ui/src/components/TrackList.svelte
rename to ui/src/lib/components/TrackList.svelte
index f6b8ee5..6ceb4e9 100644
--- a/ui/src/components/TrackList.svelte
+++ b/ui/src/lib/components/TrackList.svelte
@@ -8,7 +8,7 @@
      Spinner,
  } from 'sveltestrap';
 
- import { tracks } from '../stores/tracks';
+ import { tracks } from '$lib/stores/tracks';
 
  export let flush = false;
  export let edit = false;
diff --git a/ui/src/stores/actions.js b/ui/src/lib/stores/actions.js
similarity index 95%
rename from ui/src/stores/actions.js
rename to ui/src/lib/stores/actions.js
index 3b9796d..ca15c9c 100644
--- a/ui/src/stores/actions.js
+++ b/ui/src/lib/stores/actions.js
@@ -1,6 +1,6 @@
 import { derived, writable } from 'svelte/store';
 
-import { getActions } from '../lib/action'
+import { getActions } from '$lib/action'
 
 function createActionsStore() {
   const { subscribe, set, update } = writable({list: null, fileIdx: null});
diff --git a/ui/src/stores/alarmexceptions.js b/ui/src/lib/stores/alarmexceptions.js
similarity index 93%
rename from ui/src/stores/alarmexceptions.js
rename to ui/src/lib/stores/alarmexceptions.js
index 25a6e7c..b6b872e 100644
--- a/ui/src/stores/alarmexceptions.js
+++ b/ui/src/lib/stores/alarmexceptions.js
@@ -1,6 +1,6 @@
 import { derived, writable } from 'svelte/store';
 
-import { getAlarmsException } from '../lib/alarmexception'
+import { getAlarmsException } from '$lib/alarmexception'
 
 function createAlarmsExceptionStore() {
   const { subscribe, set, update } = writable({list: null});
diff --git a/ui/src/stores/alarmrepeated.js b/ui/src/lib/stores/alarmrepeated.js
similarity index 93%
rename from ui/src/stores/alarmrepeated.js
rename to ui/src/lib/stores/alarmrepeated.js
index d355738..063c8eb 100644
--- a/ui/src/stores/alarmrepeated.js
+++ b/ui/src/lib/stores/alarmrepeated.js
@@ -1,6 +1,6 @@
 import { derived, writable } from 'svelte/store';
 
-import { getAlarmsRepeated } from '../lib/alarmrepeated'
+import { getAlarmsRepeated } from '$lib/alarmrepeated'
 
 function createAlarmsRepeatedStore() {
   const { subscribe, set, update } = writable({list: null});
diff --git a/ui/src/stores/alarmsingle.js b/ui/src/lib/stores/alarmsingle.js
similarity index 93%
rename from ui/src/stores/alarmsingle.js
rename to ui/src/lib/stores/alarmsingle.js
index ceeba17..38b34da 100644
--- a/ui/src/stores/alarmsingle.js
+++ b/ui/src/lib/stores/alarmsingle.js
@@ -1,6 +1,6 @@
 import { derived, writable } from 'svelte/store';
 
-import { getAlarmsSingle } from '../lib/alarmsingle'
+import { getAlarmsSingle } from '$lib/alarmsingle'
 
 function createAlarmsSingleStore() {
   const { subscribe, set, update } = writable({list: null});
diff --git a/ui/src/stores/gongs.js b/ui/src/lib/stores/gongs.js
similarity index 94%
rename from ui/src/stores/gongs.js
rename to ui/src/lib/stores/gongs.js
index 2d9e1b2..33be920 100644
--- a/ui/src/stores/gongs.js
+++ b/ui/src/lib/stores/gongs.js
@@ -1,6 +1,6 @@
 import { writable } from 'svelte/store';
 
-import { getGongs } from '../lib/gong'
+import { getGongs } from '$lib/gong'
 
 function createGongsStore() {
   const { subscribe, set, update } = writable({list: null});
diff --git a/ui/src/stores/quotes.js b/ui/src/lib/stores/quotes.js
similarity index 100%
rename from ui/src/stores/quotes.js
rename to ui/src/lib/stores/quotes.js
diff --git a/ui/src/stores/routines.js b/ui/src/lib/stores/routines.js
similarity index 93%
rename from ui/src/stores/routines.js
rename to ui/src/lib/stores/routines.js
index 02ef9a0..b0eb2fd 100644
--- a/ui/src/stores/routines.js
+++ b/ui/src/lib/stores/routines.js
@@ -1,6 +1,6 @@
 import { writable } from 'svelte/store';
 
-import { getRoutines } from '../lib/routine'
+import { getRoutines } from '$lib/routine'
 
 function createRoutinesStore() {
   const { subscribe, set, update } = writable({list: null});
diff --git a/ui/src/stores/toasts.js b/ui/src/lib/stores/toasts.js
similarity index 100%
rename from ui/src/stores/toasts.js
rename to ui/src/lib/stores/toasts.js
diff --git a/ui/src/stores/tracks.js b/ui/src/lib/stores/tracks.js
similarity index 94%
rename from ui/src/stores/tracks.js
rename to ui/src/lib/stores/tracks.js
index 7a7cd4f..54b21e2 100644
--- a/ui/src/stores/tracks.js
+++ b/ui/src/lib/stores/tracks.js
@@ -1,6 +1,6 @@
 import { writable } from 'svelte/store';
 
-import { getTracks } from '../lib/track'
+import { getTracks } from '$lib/track'
 
 function createTracksStore() {
   const { subscribe, set, update } = writable({list: null});
diff --git a/ui/src/routes/+layout.svelte b/ui/src/routes/+layout.svelte
index 1f848e1..3edb5b6 100644
--- a/ui/src/routes/+layout.svelte
+++ b/ui/src/routes/+layout.svelte
@@ -6,8 +6,8 @@
      //Styles,
  } from 'sveltestrap';
 
- import Header from '../components/Header.svelte';
- import Toaster from '../components/Toaster.svelte';
+ import Header from '$lib/components/Header.svelte';
+ import Toaster from '$lib/components/Toaster.svelte';
 </script>
 
 <svelte:head>
diff --git a/ui/src/routes/+page.svelte b/ui/src/routes/+page.svelte
index a961663..eae2a33 100644
--- a/ui/src/routes/+page.svelte
+++ b/ui/src/routes/+page.svelte
@@ -4,12 +4,12 @@
      Icon,
  } from 'sveltestrap';
 
- import CycleCounter from '../components/CycleCounter.svelte';
- import DateFormat from '../components/DateFormat.svelte';
+ import CycleCounter from '$lib/components/CycleCounter.svelte';
+ import DateFormat from '$lib/components/DateFormat.svelte';
  import { isAlarmActive, alarmNextTrack, runAlarm, alarmStop } from '$lib/alarm';
  import { getNextAlarm, newNCyclesAlarm } from '$lib/alarmsingle';
- import { alarmsSingle } from '../stores/alarmsingle';
- import { quotes } from '../stores/quotes';
+ import { alarmsSingle } from '$lib/stores/alarmsingle';
+ import { quotes } from '$lib/stores/quotes';
 
  let nextAlarmP = getNextAlarm();
  let isActiveP = isAlarmActive();
diff --git a/ui/src/routes/alarms/+page.svelte b/ui/src/routes/alarms/+page.svelte
index 8ed81d6..2807c6e 100644
--- a/ui/src/routes/alarms/+page.svelte
+++ b/ui/src/routes/alarms/+page.svelte
@@ -6,9 +6,9 @@
      Icon,
  } from 'sveltestrap';
 
- import AlarmSingleList from '../../components/AlarmSingleList.svelte';
- import AlarmRepeatedList from '../../components/AlarmRepeatedList.svelte';
- import AlarmExceptionList from '../../components/AlarmExceptionList.svelte';
+ import AlarmSingleList from '$lib/components/AlarmSingleList.svelte';
+ import AlarmRepeatedList from '$lib/components/AlarmRepeatedList.svelte';
+ import AlarmExceptionList from '$lib/components/AlarmExceptionList.svelte';
 </script>
 
 <Container fluid class="flex-fill d-flex flex-column py-2">
diff --git a/ui/src/routes/alarms/[kind]/+layout.svelte b/ui/src/routes/alarms/[kind]/+layout.svelte
index c322b14..9f6faaf 100644
--- a/ui/src/routes/alarms/[kind]/+layout.svelte
+++ b/ui/src/routes/alarms/[kind]/+layout.svelte
@@ -9,9 +9,9 @@
 
  import { page } from '$app/stores';
 
- import AlarmSingleList from '../../../components/AlarmSingleList.svelte';
- import AlarmRepeatedList from '../../../components/AlarmRepeatedList.svelte';
- import AlarmExceptionList from '../../../components/AlarmExceptionList.svelte';
+ import AlarmSingleList from '$lib/components/AlarmSingleList.svelte';
+ import AlarmRepeatedList from '$lib/components/AlarmRepeatedList.svelte';
+ import AlarmExceptionList from '$lib/components/AlarmExceptionList.svelte';
 
  function slugToComponent(slug) {
      switch(slug) {
diff --git a/ui/src/routes/alarms/[kind]/+page.svelte b/ui/src/routes/alarms/[kind]/+page.svelte
index 6417ee2..b9d20b3 100644
--- a/ui/src/routes/alarms/[kind]/+page.svelte
+++ b/ui/src/routes/alarms/[kind]/+page.svelte
@@ -5,9 +5,9 @@
      Container,
  } from 'sveltestrap';
 
- import AlarmSingleList from '../../../components/AlarmSingleList.svelte';
- import AlarmRepeatedList from '../../../components/AlarmRepeatedList.svelte';
- import AlarmExceptionList from '../../../components/AlarmExceptionList.svelte';
+ import AlarmSingleList from '$lib/components/AlarmSingleList.svelte';
+ import AlarmRepeatedList from '$lib/components/AlarmRepeatedList.svelte';
+ import AlarmExceptionList from '$lib/components/AlarmExceptionList.svelte';
 
  function slugToComponent(slug) {
      switch(slug) {
diff --git a/ui/src/routes/alarms/[kind]/[aid]/+page.svelte b/ui/src/routes/alarms/[kind]/[aid]/+page.svelte
index 3d14336..7448f2a 100644
--- a/ui/src/routes/alarms/[kind]/[aid]/+page.svelte
+++ b/ui/src/routes/alarms/[kind]/[aid]/+page.svelte
@@ -13,14 +13,14 @@
  import { goto } from '$app/navigation';
  import { page } from '$app/stores';
 
- import DateFormat from '../../../../components/DateFormat.svelte';
- import DateRangeFormat from '../../../../components/DateRangeFormat.svelte';
- import { getAlarmSingle } from '../../../../lib/alarmsingle';
- import { getAlarmRepeated, weekdayStr } from '../../../../lib/alarmrepeated';
- import { getAlarmException } from '../../../../lib/alarmexception';
- import { alarmsRepeated } from '../../../../stores/alarmrepeated';
- import { alarmsSingle } from '../../../../stores/alarmsingle';
- import { alarmsExceptions } from '../../../../stores/alarmexceptions';
+ import DateFormat from '$lib/components/DateFormat.svelte';
+ import DateRangeFormat from '$lib/components/DateRangeFormat.svelte';
+ import { getAlarmSingle } from '$lib/alarmsingle';
+ import { getAlarmRepeated, weekdayStr } from '$lib/alarmrepeated';
+ import { getAlarmException } from '$lib/alarmexception';
+ import { alarmsRepeated } from '$lib/stores/alarmrepeated';
+ import { alarmsSingle } from '$lib/stores/alarmsingle';
+ import { alarmsExceptions } from '$lib/stores/alarmexceptions';
 
  function slugToTitle(slug) {
      switch(slug) {
diff --git a/ui/src/routes/alarms/[kind]/new/+page.svelte b/ui/src/routes/alarms/[kind]/new/+page.svelte
index 462dc84..3dd0813 100644
--- a/ui/src/routes/alarms/[kind]/new/+page.svelte
+++ b/ui/src/routes/alarms/[kind]/new/+page.svelte
@@ -15,14 +15,14 @@
      Spinner,
  } from 'sveltestrap';
 
- import DateTimeInput from '../../../../components/DateTimeInput.svelte';
- import { AlarmSingle } from '../../../../lib/alarmsingle';
- import { AlarmRepeated } from '../../../../lib/alarmrepeated';
- import { AlarmException } from '../../../../lib/alarmexception';
- import { alarmsRepeated } from '../../../../stores/alarmrepeated';
- import { alarmsSingle } from '../../../../stores/alarmsingle';
- import { alarmsExceptions } from '../../../../stores/alarmexceptions';
- import { routines } from '../../../../stores/routines';
+ import DateTimeInput from '$lib/components/DateTimeInput.svelte';
+ import { AlarmSingle } from '$lib/alarmsingle';
+ import { AlarmRepeated } from '$lib/alarmrepeated';
+ import { AlarmException } from '$lib/alarmexception';
+ import { alarmsRepeated } from '$lib/stores/alarmrepeated';
+ import { alarmsSingle } from '$lib/stores/alarmsingle';
+ import { alarmsExceptions } from '$lib/stores/alarmexceptions';
+ import { routines } from '$lib/stores/routines';
 
  function slugToTitle(slug) {
      switch(slug) {
diff --git a/ui/src/routes/history/+page.svelte b/ui/src/routes/history/+page.svelte
index fa16dd8..fec2b65 100644
--- a/ui/src/routes/history/+page.svelte
+++ b/ui/src/routes/history/+page.svelte
@@ -6,9 +6,9 @@
      Icon,
  } from 'sveltestrap';
 
- import CardStatAlarms from '../../components/CardStatAlarms.svelte';
- import CardStatTimeAwaking from '../../components/CardStatTimeAwaking.svelte';
- import CardStatRoutines from '../../components/CardStatRoutines.svelte';
+ import CardStatAlarms from '$lib/components/CardStatAlarms.svelte';
+ import CardStatTimeAwaking from '$lib/components/CardStatTimeAwaking.svelte';
+ import CardStatRoutines from '$lib/components/CardStatRoutines.svelte';
 </script>
 
 <Container fluid class="flex-fill d-flex flex-column justify-content-center py-2">
diff --git a/ui/src/routes/musiks/+page.svelte b/ui/src/routes/musiks/+page.svelte
index d9c0c4e..e83b1e4 100644
--- a/ui/src/routes/musiks/+page.svelte
+++ b/ui/src/routes/musiks/+page.svelte
@@ -6,9 +6,9 @@
      Icon,
  } from 'sveltestrap';
 
- import MusiksLastPlayedList from '../../components/MusiksLastPlayedList.svelte';
- import TrackList from '../../components/TrackList.svelte';
- import GongsList from '../../components/GongsList.svelte';
+ import MusiksLastPlayedList from '$lib/components/MusiksLastPlayedList.svelte';
+ import TrackList from '$lib/components/TrackList.svelte';
+ import GongsList from '$lib/components/GongsList.svelte';
 </script>
 
 <Container fluid class="flex-fill d-flex flex-column py-2">
diff --git a/ui/src/routes/musiks/gongs/+layout.svelte b/ui/src/routes/musiks/gongs/+layout.svelte
index 8c7884a..ac66f16 100644
--- a/ui/src/routes/musiks/gongs/+layout.svelte
+++ b/ui/src/routes/musiks/gongs/+layout.svelte
@@ -7,7 +7,7 @@
      Icon,
  } from 'sveltestrap';
 
- import GongsList from '../../../components/GongsList.svelte';
+ import GongsList from '$lib/components/GongsList.svelte';
 </script>
 
 <div class="d-flex flex-fill flex-column">
diff --git a/ui/src/routes/musiks/gongs/+page.svelte b/ui/src/routes/musiks/gongs/+page.svelte
index fdc4e8e..de806ba 100644
--- a/ui/src/routes/musiks/gongs/+page.svelte
+++ b/ui/src/routes/musiks/gongs/+page.svelte
@@ -4,7 +4,7 @@
      Icon,
  } from 'sveltestrap';
 
- import TrackList from '../../../components/TrackList.svelte';
+ import TrackList from '$lib/components/TrackList.svelte';
 </script>
 
 <Container fluid class="py-2 d-none d-md-flex flex-column justify-content-center align-items-center">
diff --git a/ui/src/routes/musiks/gongs/[gid]/+page.svelte b/ui/src/routes/musiks/gongs/[gid]/+page.svelte
index f2dcdc7..819e950 100644
--- a/ui/src/routes/musiks/gongs/[gid]/+page.svelte
+++ b/ui/src/routes/musiks/gongs/[gid]/+page.svelte
@@ -9,7 +9,7 @@
      Spinner,
  } from 'sveltestrap';
 
- import { getGong } from '../../../../lib/gong';
+ import { getGong } from '$lib/gong';
 </script>
 
 {#await getGong($page.params.gid)}
diff --git a/ui/src/routes/musiks/tracks/+layout.svelte b/ui/src/routes/musiks/tracks/+layout.svelte
index e2494bf..495389e 100644
--- a/ui/src/routes/musiks/tracks/+layout.svelte
+++ b/ui/src/routes/musiks/tracks/+layout.svelte
@@ -7,7 +7,7 @@
      Icon,
  } from 'sveltestrap';
 
- import TrackList from '../../../components/TrackList.svelte';
+ import TrackList from '$lib/components/TrackList.svelte';
 </script>
 
 <div class="d-flex flex-fill flex-column">
diff --git a/ui/src/routes/musiks/tracks/+page.svelte b/ui/src/routes/musiks/tracks/+page.svelte
index fdc4e8e..de806ba 100644
--- a/ui/src/routes/musiks/tracks/+page.svelte
+++ b/ui/src/routes/musiks/tracks/+page.svelte
@@ -4,7 +4,7 @@
      Icon,
  } from 'sveltestrap';
 
- import TrackList from '../../../components/TrackList.svelte';
+ import TrackList from '$lib/components/TrackList.svelte';
 </script>
 
 <Container fluid class="py-2 d-none d-md-flex flex-column justify-content-center align-items-center">
diff --git a/ui/src/routes/musiks/tracks/[tid]/+page.svelte b/ui/src/routes/musiks/tracks/[tid]/+page.svelte
index 4c500b3..34aeeda 100644
--- a/ui/src/routes/musiks/tracks/[tid]/+page.svelte
+++ b/ui/src/routes/musiks/tracks/[tid]/+page.svelte
@@ -1,15 +1,17 @@
 <script>
+ import { goto } from '$app/navigation';
  import { page } from '$app/stores';
 
  import {
      Container,
+     Icon,
      Input,
      ListGroup,
      ListGroupItem,
      Spinner,
  } from 'sveltestrap';
 
- import { getTrack } from '../../../../lib/track';
+ import { getTrack } from '$lib/track';
 </script>
 
 {#await getTrack($page.params.tid)}
diff --git a/ui/src/routes/routines/+page.svelte b/ui/src/routes/routines/+page.svelte
index 08ad7e5..9ae6561 100644
--- a/ui/src/routes/routines/+page.svelte
+++ b/ui/src/routes/routines/+page.svelte
@@ -8,10 +8,10 @@
      Spinner,
  } from 'sveltestrap';
 
- import { routines } from '../../stores/routines';
+ import { routines } from '$lib/stores/routines';
 
- import CardRoutine from '../../components/CardRoutine.svelte';
- import ActionList from '../../components/ActionList.svelte';
+ import CardRoutine from '$lib/components/CardRoutine.svelte';
+ import ActionList from '$lib/components/ActionList.svelte';
 </script>
 
 <Container fluid class="flex-fill d-flex flex-column py-2">
diff --git a/ui/src/routes/settings/+page.svelte b/ui/src/routes/settings/+page.svelte
index 71ae707..dc2c579 100644
--- a/ui/src/routes/settings/+page.svelte
+++ b/ui/src/routes/settings/+page.svelte
@@ -11,8 +11,8 @@
      Spinner,
  } from 'sveltestrap';
 
- import { actions } from '../../stores/actions';
- import { getSettings } from '../../lib/settings';
+ import { actions } from '$lib/stores/actions';
+ import { getSettings } from '$lib/settings';
 
  let settingsP = getSettings();