diff --git a/src/lib/stores.js b/src/lib/stores.svelte.js
similarity index 86%
rename from src/lib/stores.js
rename to src/lib/stores.svelte.js
index f32d7bb..a0df23f 100644
--- a/src/lib/stores.js
+++ b/src/lib/stores.svelte.js
@@ -1,18 +1,18 @@
-import { writable, get } from 'svelte/store';
+import { writable } from 'svelte/store';
 import { browser } from '$app/environment';
+import { SvelteSet } from 'svelte/reactivity';
 
 export const currentStream = writable({});
 export const currentSongIndex = writable(null);
 
-export const favoritedStreams = writable(
-    new Set(JSON.parse((browser && localStorage.getItem('favoritedStreams')) || '[]'))
+export const favoritedStreams = new SvelteSet(
+    JSON.parse((browser && localStorage.getItem('favoritedStreams')) || '[]')
 );
-
-if (browser) {
-    favoritedStreams.subscribe((val) => {
-        localStorage.setItem('favoritedStreams', JSON.stringify(Array.from(val)));
+$effect.root(() => {
+    $effect(() => {
+        localStorage.setItem('favoritedStreams', JSON.stringify(Array.from(favoritedStreams)));
     });
-}
+});
 
 export const tagList = [
     'acoustic',
diff --git a/src/routes/streams/Sidebar.svelte b/src/routes/streams/Sidebar.svelte
index 0ecf1fd..c15e11b 100644
--- a/src/routes/streams/Sidebar.svelte
+++ b/src/routes/streams/Sidebar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { untrack } from 'svelte';
     import { goto } from '$app/navigation';
-    import { currentStream, favoritedStreams } from '$lib/stores.js';
+    import { currentStream, favoritedStreams } from '$lib/stores.svelte.js';
     import { hashColor, shorthandCode, formatSecondsToHms, formatDate } from '$lib/utils.js';
     import TagSelect from './TagSelect.svelte';
 
@@ -40,10 +40,9 @@
     }
 
     function updateFavorites(stream) {
-        $favoritedStreams.has(stream['id'])
-            ? $favoritedStreams.delete(stream['id'])
-            : $favoritedStreams.add(stream['id']);
-        $favoritedStreams = $favoritedStreams; // for reactivity
+        favoritedStreams.has(stream['id'])
+            ? favoritedStreams.delete(stream['id'])
+            : favoritedStreams.add(stream['id']);
     }
 </script>
 
@@ -57,7 +56,7 @@
 
 <ul class="stream-list">
     {#each streams as stream}
-        {@const favorited = $favoritedStreams.has(stream['id'])}
+        {@const favorited = favoritedStreams.has(stream['id'])}
         {@const current = $currentStream['id'] === stream['id']}
         <li
             hidden={!displayedStreams.includes(stream) || (favoritesOnly && !favorited)}
diff --git a/src/routes/streams/TagSelect.svelte b/src/routes/streams/TagSelect.svelte
index 2e56cf6..e854cb8 100644
--- a/src/routes/streams/TagSelect.svelte
+++ b/src/routes/streams/TagSelect.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import Select from 'svelte-select';
-    import { tagList } from '$lib/stores.js';
+    import { tagList } from '$lib/stores.svelte.js';
 
     let { checked = $bindable([]), remainingTags = [], listOpen = $bindable() } = $props();
     let items = $state(tagList.map((x) => ({ value: x, label: x })));
diff --git a/src/routes/streams/WelcomePage.svelte b/src/routes/streams/WelcomePage.svelte
index 28c388c..bf1af3c 100644
--- a/src/routes/streams/WelcomePage.svelte
+++ b/src/routes/streams/WelcomePage.svelte
@@ -1,5 +1,5 @@
 <script>
-    import { currentStream } from '$lib/stores.js';
+    import { currentStream } from '$lib/stores.svelte.js';
 
     currentStream.set({});
 </script>
diff --git a/src/routes/streams/[stream_id]/+page.svelte b/src/routes/streams/[stream_id]/+page.svelte
index 77d2b59..f8276bb 100644
--- a/src/routes/streams/[stream_id]/+page.svelte
+++ b/src/routes/streams/[stream_id]/+page.svelte
@@ -5,7 +5,7 @@
     import MetadataEditor from './MetadataEditor.svelte';
     import Player from './Player.svelte';
     import { dev } from '$app/environment';
-    import { currentStream, updateCurrentStream } from '$lib/stores.js';
+    import { currentStream, updateCurrentStream } from '$lib/stores.svelte.js';
 
     let { data } = $props();
 
diff --git a/src/routes/streams/[stream_id]/MetadataEditor.svelte b/src/routes/streams/[stream_id]/MetadataEditor.svelte
index 921214e..4b63d55 100644
--- a/src/routes/streams/[stream_id]/MetadataEditor.svelte
+++ b/src/routes/streams/[stream_id]/MetadataEditor.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { page } from '$app/stores';
-    import { tagList } from '$lib/stores.js';
+    import { tagList } from '$lib/stores.svelte.js';
 
     let { original = $bindable() } = $props();
 
diff --git a/src/routes/streams/[stream_id]/Player.svelte b/src/routes/streams/[stream_id]/Player.svelte
index 810c065..3d7aae4 100644
--- a/src/routes/streams/[stream_id]/Player.svelte
+++ b/src/routes/streams/[stream_id]/Player.svelte
@@ -24,7 +24,7 @@
         currentStream,
         getSongAtTime,
         updateCurrentSong
-    } from '$lib/stores.js';
+    } from '$lib/stores.svelte.js';
 
     interface Props {
         src: any;
diff --git a/src/routes/streams/[stream_id]/StreamPage.svelte b/src/routes/streams/[stream_id]/StreamPage.svelte
index bf876e7..9958a8b 100644
--- a/src/routes/streams/[stream_id]/StreamPage.svelte
+++ b/src/routes/streams/[stream_id]/StreamPage.svelte
@@ -1,5 +1,5 @@
 <script>
-    import { currentStream, currentSongIndex } from '$lib/stores.js';
+    import { currentStream, currentSongIndex } from '$lib/stores.svelte.js';
     import { shorthandCode, formatTrackTime, formatDate } from '$lib/utils.js';
     import { jumpToTrack } from './Player.svelte';
     import { Carta } from 'carta-md';