diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
index 992593e..f6f4741 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/Header.svelte
@@ -6,27 +6,15 @@
 	import * as Avatar from '$lib/components/ui/avatar';
 	import { toggleMode } from "mode-watcher";
 	import ThemeSelector from './ThemeSelector.svelte';
-	
-	
+
 	// Icons
 	import Sun from '@lucide/svelte/icons/sun';
 	import Moon from '@lucide/svelte/icons/moon';
 	import User from '@lucide/svelte/icons/user';
 	import Settings from '@lucide/svelte/icons/settings';
 	import LogOut from '@lucide/svelte/icons/log-out';
-	import Monitor from '@lucide/svelte/icons/monitor';
-	
+
 	let { user, class: className = '' }: { user?: any; class?: string } = $props();
-	
-	// Dark mode state - you might want to use a proper theme store
-	let darkMode = $state(false);
-	
-	// Theme options
-	const themes = [
-		{ label: 'Light', value: 'light', icon: Sun },
-		{ label: 'Dark', value: 'dark', icon: Moon },
-		{ label: 'System', value: 'system', icon: Monitor }
-	];
 </script>
 
 <header class={cn(
@@ -45,10 +33,10 @@
 		<!-- Dark Mode Toggle -->
 		<Button onclick={toggleMode} variant="ghost" size="icon">
 			<Sun
-				class="h-[1.2rem] w-[1.2rem] scale-100 rotate-0 !transition-all dark:scale-0 dark:-rotate-90"
+				class="h-[1.2rem] w-[1.2rem] scale-100 rotate-0 transition-all! dark:scale-0 dark:-rotate-90"
 			/>
 			<Moon
-				class="absolute h-[1.2rem] w-[1.2rem] scale-0 rotate-90 !transition-all dark:scale-100 dark:rotate-0"
+				class="absolute h-[1.2rem] w-[1.2rem] scale-0 rotate-90 transition-all! dark:scale-100 dark:rotate-0"
 			/>
 			<span class="sr-only">Toggle theme</span>
 			</Button>
diff --git a/src/lib/components/Sidebar.svelte b/src/lib/components/Sidebar.svelte
index 61e9d65..0bffb0b 100644
--- a/src/lib/components/Sidebar.svelte
+++ b/src/lib/components/Sidebar.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-
-    import { House, Settings, Activity, CheckSquare, Bell, LayoutDashboard, Goal, NotebookPen } from "@lucide/svelte";
+    import { House, Settings, Activity, Goal, NotebookPen } from "@lucide/svelte";
     import * as Sidebar from "$lib/components/ui/sidebar/index";
 
     import { page } from '$app/state'
@@ -44,7 +43,7 @@
           <Sidebar.MenuItem>
             <div class="flex gap-3 pt-2 px-1 items-center">
               <Goal class="h-6 w-6" />
-              <h1 class="text-lg font-semibold">MyApp</h1>
+              <h1 class="text-lg font-semibold">bullseye</h1>
             </div>
           </Sidebar.MenuItem>
         </Sidebar.Menu>
diff --git a/src/lib/components/ThemeSelector.svelte b/src/lib/components/ThemeSelector.svelte
index 9b2c8e8..1206808 100644
--- a/src/lib/components/ThemeSelector.svelte
+++ b/src/lib/components/ThemeSelector.svelte
@@ -31,7 +31,7 @@
 			<p class="text-sm font-medium text-muted-foreground">Primary Color</p>
 
 			<div class="grid grid-cols-3 gap-2">
-				{#each primaryColors as color}
+				{#each primaryColors as color (color.value)}
 					<button
 						onclick={() => selectColor(color.value)}
 						class="relative h-8 w-full rounded-md border border-border transition-transform hover:scale-105"
diff --git a/src/lib/components/connection-status.svelte b/src/lib/components/connection-status.svelte
index 514232e..991e397 100644
--- a/src/lib/components/connection-status.svelte
+++ b/src/lib/components/connection-status.svelte
@@ -2,19 +2,18 @@
   import { useConnectionStatus } from '@triplit/svelte';
   import { triplit } from '$lib/triplit/client';
   import { cn } from '$lib/utils';
-  import { onMount } from 'svelte';
-  
+
   // Icons
   import Wifi from '@lucide/svelte/icons/wifi';
   import WifiOff from '@lucide/svelte/icons/wifi-off';
   import Loader2 from '@lucide/svelte/icons/loader-2';
 
   const connection = useConnectionStatus(triplit);
-  
+
   // Track overall connection attempt duration (including retries)
   let initialConnectionAttemptTime = $state<number | null>(null);
   let hasTimedOut = $state(false);
-  let timeoutId = $state<number | null>(null);
+  let timeoutId = $state<ReturnType<typeof setTimeout> | null>(null);
   const CONNECTION_TIMEOUT = 15000; // 15 seconds for entire connection attempt
   
   // Monitor connection status changes
@@ -42,7 +41,7 @@
   });
   
   // Map connection status to display info
-  const statusInfo = $derived(() => {
+  const statusInfo = $derived.by(() => {
     // If we've timed out after trying to connect, show connection failed
     if (hasTimedOut) {
       return {
@@ -89,7 +88,7 @@
     <div class="relative flex items-center">
       <div class={cn(
         "h-2 w-2 rounded-full",
-        statusInfo().indicatorClass
+        statusInfo.indicatorClass
       )}>
       </div>
       <!-- Pulse animation for connecting state -->
@@ -103,17 +102,14 @@
     </div>
     
     <!-- Status Icon -->
-    {#snippet iconSnippet()}
-      {@const IconComponent = statusInfo().icon}
-      <IconComponent 
-        class={cn("h-3 w-3", statusInfo().iconClass)} 
-      />
-    {/snippet}
-    {@render iconSnippet()}
-    
+    {#if statusInfo.icon}
+      {@const Icon = statusInfo.icon}
+      <Icon class={cn("h-3 w-3", statusInfo.iconClass)} />
+    {/if}
+
     <!-- Status Text -->
     <span class="font-medium">
-      {statusInfo().text}
+      {statusInfo.text}
     </span>
   </div>
 </div>
\ No newline at end of file