diff --git a/src/lib/components/Toast.svelte b/src/lib/components/Toast.svelte
index 4819fb8..ce76945 100644
--- a/src/lib/components/Toast.svelte
+++ b/src/lib/components/Toast.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { fly } from 'svelte/transition';
-	import { getToasts, removeToast, type ToastType } from '$lib/stores/toasts.js';
+	import { getToasts, removeToast, type ToastType } from '$lib/stores/toasts.svelte.js';
 
 	const toasts = $derived(getToasts());
 
diff --git a/src/lib/stores/theme.ts b/src/lib/stores/theme.svelte.ts
similarity index 100%
rename from src/lib/stores/theme.ts
rename to src/lib/stores/theme.svelte.ts
diff --git a/src/lib/stores/toasts.ts b/src/lib/stores/toasts.svelte.ts
similarity index 100%
rename from src/lib/stores/toasts.ts
rename to src/lib/stores/toasts.svelte.ts
diff --git a/src/lib/utils/api.ts b/src/lib/utils/api.ts
index 6df6bce..9d222e5 100644
--- a/src/lib/utils/api.ts
+++ b/src/lib/utils/api.ts
@@ -1,4 +1,4 @@
-import { toast } from '$lib/stores/toasts.js';
+import { toast } from '$lib/stores/toasts.svelte.js';
 import { getSocketId } from '$lib/stores/socket.js';
 
 export type ApiResult<T = any> = {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 3de3d46..412c85c 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,7 +3,7 @@
 	import type { Snippet } from 'svelte';
 	import { onMount } from 'svelte';
 	import { connectSocket, disconnectSocket } from '$lib/stores/socket.js';
-	import { initTheme, toggleTheme, getTheme } from '$lib/stores/theme.js';
+	import { initTheme, toggleTheme, getTheme } from '$lib/stores/theme.svelte.js';
 	import NotificationBell from '$lib/components/NotificationBell.svelte';
 	import SearchBar from '$lib/components/SearchBar.svelte';
 	import Toast from '$lib/components/Toast.svelte';
diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte
index 70e3c01..eee4983 100644
--- a/src/routes/admin/+page.svelte
+++ b/src/routes/admin/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { api } from '$lib/utils/api.js';
-	import { toast } from '$lib/stores/toasts.js';
+	import { toast } from '$lib/stores/toasts.svelte.js';
 
 	let { data } = $props();
 
diff --git a/src/routes/admin/site/+page.svelte b/src/routes/admin/site/+page.svelte
index b835652..3d67430 100644
--- a/src/routes/admin/site/+page.svelte
+++ b/src/routes/admin/site/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { api } from '$lib/utils/api.js';
-	import { toast } from '$lib/stores/toasts.js';
+	import { toast } from '$lib/stores/toasts.svelte.js';
 
 	let { data } = $props();
 
diff --git a/src/routes/boards/+page.svelte b/src/routes/boards/+page.svelte
index 25a53c1..8c036ef 100644
--- a/src/routes/boards/+page.svelte
+++ b/src/routes/boards/+page.svelte
@@ -3,7 +3,7 @@
 	import { page } from '$app/stores';
 	import { replaceState } from '$app/navigation';
 	import { api } from '$lib/utils/api.js';
-	import { toast } from '$lib/stores/toasts.js';
+	import { toast } from '$lib/stores/toasts.svelte.js';
 
 	let { data } = $props();
 
diff --git a/src/routes/boards/[boardId]/+page.svelte b/src/routes/boards/[boardId]/+page.svelte
index 08f8eaf..9ee3fcf 100644
--- a/src/routes/boards/[boardId]/+page.svelte
+++ b/src/routes/boards/[boardId]/+page.svelte
@@ -6,7 +6,7 @@
 	import { getDueUrgency, getUrgencyClasses, formatDueDate } from '$lib/utils/due-date.js';
 	import { joinBoard, leaveBoard, onBoardEvent, offBoardEvent, getSocketId } from '$lib/stores/socket.js';
 	import { api } from '$lib/utils/api.js';
-	import { toast } from '$lib/stores/toasts.js';
+	import { toast } from '$lib/stores/toasts.svelte.js';
 	import CardModal from '$lib/components/CardModal.svelte';
 	import ActivityFeed from '$lib/components/ActivityFeed.svelte';
 	import BoardFilters from '$lib/components/BoardFilters.svelte';