diff --git a/.gitcore/features.json b/.gitcore/features.json
index 94cd8039..fe00a750 100644
--- a/.gitcore/features.json
+++ b/.gitcore/features.json
@@ -153,9 +153,9 @@
       "name": "Svelte 5 Frontend",
       "phase": 5,
       "crate": "apps/desktop",
-      "passes": false,
+      "passes": true,
       "tests": [],
-      "last_updated": null
+      "last_updated": "2025-05-22"
     }
   ],
   "agents": {
diff --git a/apps/desktop/src/lib/components/ChatHistory.svelte b/apps/desktop/src/lib/components/ChatHistory.svelte
index e337c098..d2d83edf 100644
--- a/apps/desktop/src/lib/components/ChatHistory.svelte
+++ b/apps/desktop/src/lib/components/ChatHistory.svelte
@@ -3,6 +3,8 @@
   import DOMPurify from 'dompurify';
   import GenerativeCanvas from './GenerativeCanvas.svelte';
   import { chatHistory } from '$lib/store.svelte';
+
+  let { } = $props();
 </script>
 
 <div class="space-y-6">
diff --git a/apps/desktop/src/lib/components/ConnectPeer.svelte b/apps/desktop/src/lib/components/ConnectPeer.svelte
index 61524d6a..92bcf1d5 100644
--- a/apps/desktop/src/lib/components/ConnectPeer.svelte
+++ b/apps/desktop/src/lib/components/ConnectPeer.svelte
@@ -2,10 +2,10 @@
   import { invoke } from '@tauri-apps/api/core';
   import { onMount } from 'svelte';
 
-  let address = '';
-  let status = '';
-  let isConnecting = false;
-  let recentAddresses: string[] = [];
+  let address = $state('');
+  let status = $state('');
+  let isConnecting = $state(false);
+  let recentAddresses: string[] = $state([]);
 
   onMount(() => {
     const storedAddresses = localStorage.getItem('recentPeerAddresses');
@@ -50,10 +50,10 @@
       placeholder="/ip4/192.168.1.100/tcp/4001"
       bind:value={address}
       class="w-full bg-gray-900/80 border border-cyan-900/40 p-2 rounded text-cyan-300 placeholder-cyan-700/50 focus:outline-none focus:border-cyan-500/50 pr-24"
-      on:keydown={(e) => e.key === 'Enter' && connectToPeer()}
+      onkeydown={(e) => e.key === 'Enter' && connectToPeer()}
     />
     <button
-      on:click={connectToPeer}
+      onclick={connectToPeer}
       disabled={isConnecting}
       class="absolute right-1 top-1 bottom-1 px-4 text-sm bg-cyan-500/20 text-cyan-300 rounded border border-cyan-500/50 hover:bg-cyan-500/40 disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center"
     >
@@ -81,7 +81,7 @@
         {#each recentAddresses as addr}
           <li>
             <button
-              on:click={() => address = addr}
+              onclick={() => address = addr}
               class="text-xs bg-gray-800/50 px-2 py-1 rounded border border-gray-700 hover:bg-gray-700/70"
             >
               {addr}
diff --git a/apps/desktop/src/lib/components/Dojo.svelte b/apps/desktop/src/lib/components/Dojo.svelte
index ee06f3fd..139119b0 100644
--- a/apps/desktop/src/lib/components/Dojo.svelte
+++ b/apps/desktop/src/lib/components/Dojo.svelte
@@ -1,26 +1,25 @@
 <script lang="ts">
   import { tweened } from 'svelte/motion';
   import { cubicOut } from 'svelte/easing';
-  import { createEventDispatcher } from 'svelte';
   import NodeInfoPanel from './NodeInfoPanel.svelte';
 
-  const dispatch = createEventDispatcher();
+  let { onUpdateTokens }: { onUpdateTokens?: (amount: number) => void } = $props();
 
   // Mock data for the current validation task
-  let question = "How do I fix a memory leak?";
-  let answerA = "Check for unclosed references and ensure proper resource disposal in your code.";
-  let answerB = "Restart your computer every hour and hope for the best.";
+  let question = $state("How do I fix a memory leak?");
+  let answerA = $state("Check for unclosed references and ensure proper resource disposal in your code.");
+  let answerB = $state("Restart your computer every hour and hope for the best.");
 
   // Reactive state
-  let streak = 5;
+  let streak = $state(5);
   let earnedTokens = tweened(0, {
     duration: 400,
     easing: cubicOut,
   });
-  let selected: 'A' | 'B' | null = null;
-  let feedbackMessage = '';
-  let isAnimating = false;
-  let lastAnswerResult: 'correct' | 'incorrect' | null = null;
+  let selected: 'A' | 'B' | null = $state(null);
+  let feedbackMessage = $state('');
+  let isAnimating = $state(false);
+  let lastAnswerResult: 'correct' | 'incorrect' | null = $state(null);
 
   async function handleSelection(choice: 'A' | 'B') {
     if (isAnimating) return;
@@ -40,7 +39,7 @@
       const reward = 10 + Math.floor(streak / 5); // Bonus for longer streaks
       feedbackMessage = `Correct!`;
       earnedTokens.set(reward);
-      dispatch('updateTokens', { amount: reward });
+      onUpdateTokens?.(reward);
     } else {
       lastAnswerResult = 'incorrect';
       streak = 0;
@@ -85,7 +84,7 @@
         <span class="answer-label">A)</span>
         <p>{answerA}</p>
       </div>
-      <button class="select-button" on:click={() => handleSelection('A')} disabled={isAnimating}>
+      <button class="select-button" onclick={() => handleSelection('A')} disabled={isAnimating}>
         [SELECT A]
       </button>
     </div>
@@ -99,7 +98,7 @@
         <span class="answer-label">B)</span>
         <p>{answerB}</p>
       </div>
-      <button class="select-button" on:click={() => handleSelection('B')} disabled={isAnimating}>
+      <button class="select-button" onclick={() => handleSelection('B')} disabled={isAnimating}>
         [SELECT B]
       </button>
     </div>
diff --git a/apps/desktop/src/lib/components/DojoPanel.svelte b/apps/desktop/src/lib/components/DojoPanel.svelte
index 4dbb13bf..8f31eee6 100644
--- a/apps/desktop/src/lib/components/DojoPanel.svelte
+++ b/apps/desktop/src/lib/components/DojoPanel.svelte
@@ -11,10 +11,10 @@
       reward: number;
   }
 
-  let currentTask: DojoTask | null = null;
-  let loading = false;
-  let rewardVisible = false;
-  let rewardAmount = 0;
+  let currentTask: DojoTask | null = $state(null);
+  let loading = $state(false);
+  let rewardVisible = $state(false);
+  let rewardAmount = $state(0);
 
   async function loadTask() {
       try {
@@ -94,7 +94,7 @@
           <!-- Options -->
           <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
               <button
-                  on:click={() => submit(currentTask?.option_a || "")}
+                  onclick={() => submit(currentTask?.option_a || "")}
                   class="group relative h-48 bg-gradient-to-br from-zinc-900 to-zinc-900 border border-zinc-700 rounded-xl p-6 transition-all duration-300 hover:scale-[1.02] hover:border-emerald-500/50 hover:from-emerald-900/10 text-left">
                   <div class="absolute top-4 left-4 text-zinc-600 text-5xl font-black opacity-20 group-hover:text-emerald-500/20 transition-colors">A</div>
                   <div class="relative z-10 h-full flex items-center justify-center text-center">
@@ -105,7 +105,7 @@
               </button>
 
               <button
-                   on:click={() => submit(currentTask?.option_b || "")}
+                   onclick={() => submit(currentTask?.option_b || "")}
                    class="group relative h-48 bg-gradient-to-br from-zinc-900 to-zinc-900 border border-zinc-700 rounded-xl p-6 transition-all duration-300 hover:scale-[1.02] hover:border-blue-500/50 hover:from-blue-900/10 text-left">
                   <div class="absolute top-4 left-4 text-zinc-600 text-5xl font-black opacity-20 group-hover:text-blue-500/20 transition-colors">B</div>
                   <div class="relative z-10 h-full flex items-center justify-center text-center">
diff --git a/apps/desktop/src/lib/components/GenerativeCanvas.svelte b/apps/desktop/src/lib/components/GenerativeCanvas.svelte
index a97045c6..bf3fcc8c 100644
--- a/apps/desktop/src/lib/components/GenerativeCanvas.svelte
+++ b/apps/desktop/src/lib/components/GenerativeCanvas.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  export let blueprint: any = null;
+  let { blueprint = null }: { blueprint: any } = $props();
 
   // Simple renderer for "Diffusion UI"
   // In a real system, this would dynamically compile Svelte or use a component map
diff --git a/apps/desktop/src/lib/components/ModelManager.svelte b/apps/desktop/src/lib/components/ModelManager.svelte
index e6e5627d..4c4eefab 100644
--- a/apps/desktop/src/lib/components/ModelManager.svelte
+++ b/apps/desktop/src/lib/components/ModelManager.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  // import { invoke } from '@tauri-apps/api/core'; // Uncomment when ready
+  import { invoke } from '@tauri-apps/api/core';
 
   interface Model {
     id: string;
@@ -13,7 +13,7 @@
     recommended?: boolean; // If the system recommends this model for evolution
   }
 
-  let models: Model[] = [
+  let models: Model[] = $state([
     {
       id: 'phi-3-mini-4k-instruct',
       name: 'Phi-3 Mini',
@@ -47,38 +47,35 @@
       status: 'ready',
       tags: ['vision', 'core']
     }
-  ];
+  ]);
 
-  let autoEvolutionEnabled = false;
+  let autoEvolutionEnabled = $state(false);
 
   async function downloadModel(id: string) {
-    // Mock download logic
+    // Start local progress tracking
     models = models.map(m => m.id === id ? { ...m, status: 'downloading', progress: 0 } : m);
 
-    // Simulate download
-    const interval = setInterval(() => {
-      models = models.map(m => {
-        if (m.id === id && m.status === 'downloading') {
-          const newProgress = (m.progress || 0) + 10;
-          if (newProgress >= 100) {
-            clearInterval(interval);
-            return { ...m, status: 'ready', progress: 100 };
-          }
-          return { ...m, progress: newProgress };
-        }
-        return m;
-      });
-    }, 500);
-
-    // await invoke('download_model', { modelId: id });
+    try {
+      await invoke('download_model', { model_id: id });
+      // On success, set to ready
+      models = models.map(m => m.id === id ? { ...m, status: 'ready', progress: 100 } : m);
+    } catch (e) {
+      console.error("Failed to download model:", e);
+      // Reset status on error
+      models = models.map(m => m.id === id ? { ...m, status: 'available' } : m);
+    }
   }
 
   async function activateModel(id: string) {
-    models = models.map(m => ({
-      ...m,
-      status: m.id === id ? 'active' : (m.status === 'active' ? 'ready' : m.status)
-    }));
-    // await invoke('load_model', { modelId: id });
+    try {
+      await invoke('load_model', { model_id: id });
+      models = models.map(m => ({
+        ...m,
+        status: m.id === id ? 'active' : (m.status === 'active' ? 'ready' : m.status)
+      }));
+    } catch (e) {
+      console.error("Failed to load model:", e);
+    }
   }
 
   function toggleAutoEvolution() {
@@ -98,7 +95,7 @@
     <button
       class="flex items-center gap-3 px-4 py-2 rounded-full border transition-all duration-300
       {autoEvolutionEnabled ? 'bg-neural-purple/10 border-neural-purple text-neural-purple shadow-neon-purple' : 'bg-void-gray border-void-gray text-gray-400 hover:border-gray-600'}"
-      on:click={toggleAutoEvolution}
+      onclick={toggleAutoEvolution}
     >
       <div class="flex flex-col items-end">
         <span class="text-[10px] font-bold tracking-wider">AUTO-EVOLUTION</span>
@@ -159,7 +156,7 @@
             {#if model.status === 'available'}
               <button
                 class="w-full py-2 rounded bg-void-gray hover:bg-gray-800 text-white text-xs font-bold tracking-wider transition-all flex items-center justify-center gap-2 group/btn"
-                on:click={() => downloadModel(model.id)}
+                onclick={() => downloadModel(model.id)}
               >
                 <svg class="w-3 h-3 text-gray-400 group-hover/btn:text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"></path></svg>
                 DOWNLOAD
@@ -180,7 +177,7 @@
                 {model.status === 'active'
                   ? 'bg-cyber-cyan/10 text-cyber-cyan border border-cyber-cyan/50 cursor-default'
                   : 'bg-white text-black hover:bg-gray-200 hover:shadow-lg'}"
-                on:click={() => model.status !== 'active' && activateModel(model.id)}
+                onclick={() => model.status !== 'active' && activateModel(model.id)}
                 disabled={model.status === 'active'}
               >
                 {#if model.status === 'active'}
diff --git a/apps/desktop/src/lib/components/NodeInfoPanel.svelte b/apps/desktop/src/lib/components/NodeInfoPanel.svelte
index 3ddac3ff..eda0a7b6 100644
--- a/apps/desktop/src/lib/components/NodeInfoPanel.svelte
+++ b/apps/desktop/src/lib/components/NodeInfoPanel.svelte
@@ -2,26 +2,18 @@
   import { onMount } from 'svelte';
   import { invoke } from '@tauri-apps/api/core';
 
-  let nodeInfo: any = null;
-  let error = null;
+  let nodeInfo: any = $state(null);
+  let error = $state(null);
 
   onMount(async () => {
-    // MOCK DATA FOR VISUAL VERIFICATION
-    nodeInfo = {
-        peer_id: '12D3KooWQ...mock_peer_id...xyz',
-        addresses: [
-            '/ip4/192.168.1.10/tcp/12345',
-            '/ip4/10.0.0.5/tcp/12345'
-        ]
-    };
-    // try {
-    //   const info = await invoke('get_node_info');
-    //   // Filter out loopback addresses
-    //   info.addresses = info.addresses.filter(addr => !addr.includes('127.0.0.1'));
-    //   nodeInfo = info;
-    // } catch (e) {
-    //   error = e;
-    // }
+    try {
+      const info: any = await invoke('get_node_info');
+      // Filter out loopback addresses
+      info.addresses = info.addresses.filter((addr: string) => !addr.includes('127.0.0.1'));
+      nodeInfo = info;
+    } catch (e: any) {
+      error = e;
+    }
   });
 
   function copyAddress(addr: string) {
@@ -38,7 +30,7 @@
       {#each nodeInfo.addresses as addr}
         <div class="address-row">
           <code>{addr}</code>
-          <button on:click={() => copyAddress(addr)}>📋 Copy</button>
+          <button onclick={() => copyAddress(addr)}>📋 Copy</button>
         </div>
       {/each}
     {:else}
diff --git a/apps/desktop/src/lib/components/NodeQRCode.svelte b/apps/desktop/src/lib/components/NodeQRCode.svelte
index bc00670f..8e6113d8 100644
--- a/apps/desktop/src/lib/components/NodeQRCode.svelte
+++ b/apps/desktop/src/lib/components/NodeQRCode.svelte
@@ -7,9 +7,9 @@
     addresses: string[];
   }
 
-  let qrDataUrl = '';
-  let selectedAddress = '';
-  let addresses: string[] = [];
+  let qrDataUrl = $state('');
+  let selectedAddress = $state('');
+  let addresses: string[] = $state([]);
 
   onMount(async () => {
     const nodeInfo = await invoke<NodeInfo>('get_node_info');
@@ -37,7 +37,7 @@
   <h4>📱 Scan to Connect</h4>
 
   {#if addresses.length > 1}
-    <select bind:value={selectedAddress} on:change={() => generateQR(selectedAddress)}>
+    <select bind:value={selectedAddress} onchange={() => generateQR(selectedAddress)}>
       {#each addresses as addr}
         <option value={addr}>{addr}</option>
       {/each}
diff --git a/apps/desktop/src/lib/components/PermissionGuard.svelte b/apps/desktop/src/lib/components/PermissionGuard.svelte
index 874f6b4e..3a35c543 100644
--- a/apps/desktop/src/lib/components/PermissionGuard.svelte
+++ b/apps/desktop/src/lib/components/PermissionGuard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  // import { invoke } from '@tauri-apps/api/core'; // Uncomment when ready
+  import { invoke } from '@tauri-apps/api/core';
 
   interface Permission {
     id: string;
@@ -11,7 +11,7 @@
     critical: boolean;
   }
 
-  let permissions: Permission[] = [
+  let permissions: Permission[] = $state([
     {
       id: 'camera',
       name: 'Visual Cortex',
@@ -44,16 +44,17 @@
       granted: true,
       critical: true
     }
-  ];
+  ]);
 
-  let allGranted = false;
-
-  $: allGranted = permissions.every(p => p.granted);
+  let allGranted = $derived(permissions.every(p => p.granted));
 
   async function requestPermission(id: string) {
-    // Mock request
-    // await invoke('request_permission', { permission: id });
-    permissions = permissions.map(p => p.id === id ? { ...p, granted: true } : p);
+    try {
+      await invoke('request_permission', { permission: id });
+      permissions = permissions.map(p => p.id === id ? { ...p, granted: true } : p);
+    } catch (e) {
+      console.error("Permission request failed:", e);
+    }
   }
 
   async function requestAll() {
@@ -109,7 +110,7 @@
               </div>
             {:else}
               <button
-                on:click={() => requestPermission(p.id)}
+                onclick={() => requestPermission(p.id)}
                 class="px-4 py-2 bg-gray-700 hover:bg-gray-600 text-white text-sm rounded transition-colors"
               >
                 Connect
@@ -121,7 +122,7 @@
 
       <div class="p-6 bg-gray-800/50 border-t border-gray-700 flex justify-end">
         <button
-          on:click={requestAll}
+          onclick={requestAll}
           class="px-6 py-3 bg-cyan-600 hover:bg-cyan-500 text-white font-bold rounded-lg shadow-lg shadow-cyan-900/20 transition-all flex items-center gap-2"
         >
           Initialize All Systems
diff --git a/apps/desktop/src/lib/components/Terminal.svelte b/apps/desktop/src/lib/components/Terminal.svelte
index 00450939..de886d59 100644
--- a/apps/desktop/src/lib/components/Terminal.svelte
+++ b/apps/desktop/src/lib/components/Terminal.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import { onMount, afterUpdate } from 'svelte';
+  import { onMount } from 'svelte';
   import { invoke } from '@tauri-apps/api/core';
   import ChatHistory from './ChatHistory.svelte';
   import { chatHistory, type Message } from '$lib/store.svelte';
 
-  let userInput = '';
-  let historyContainer: HTMLElement;
+  let userInput = $state('');
+  let historyContainer: HTMLElement | undefined = $state();
 
   const SUGGESTED_COMMANDS = ['/help', '/status', '/scan', 'Hola', '/generate'];
 
@@ -14,7 +14,9 @@
     scrollToBottom();
   });
 
-  afterUpdate(() => {
+  $effect(() => {
+    // This effect runs whenever chatHistory.messages changes
+    chatHistory.messages;
     scrollToBottom();
   });
 
@@ -85,7 +87,7 @@
       {#each SUGGESTED_COMMANDS as cmd}
         <button
           class="px-3 py-1 rounded-full bg-void-gray border border-gray-800 text-[10px] text-gray-400 hover:border-cyber-cyan hover:text-cyber-cyan transition-colors whitespace-nowrap"
-          on:click={() => handleSubmit(cmd)}
+          onclick={() => handleSubmit(cmd)}
         >
           {cmd}
         </button>
@@ -97,14 +99,14 @@
       <input
         type="text"
         bind:value={userInput}
-        on:keydown={(e) => e.key === 'Enter' && handleSubmit()}
+        onkeydown={(e) => e.key === 'Enter' && handleSubmit()}
         placeholder="Enter command or chat..."
         class="w-full bg-black/50 border border-void-gray rounded-full py-3 pl-10 pr-10 text-white focus:outline-none focus:border-cyber-cyan focus:ring-1 focus:ring-cyber-cyan transition-all placeholder:text-gray-700"
       />
       <button
         aria-label="Submit command"
         class="absolute right-2 p-2 text-gray-500 hover:text-cyber-cyan transition-colors"
-        on:click={() => handleSubmit()}
+        onclick={() => handleSubmit()}
       >
         <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="22" y1="2" x2="11" y2="13"></line><polygon points="22 2 15 22 11 13 2 9 22 2"></polygon></svg>
       </button>
diff --git a/apps/desktop/src/lib/components/WalletPanel.svelte b/apps/desktop/src/lib/components/WalletPanel.svelte
index cce05bb5..3dea9979 100644
--- a/apps/desktop/src/lib/components/WalletPanel.svelte
+++ b/apps/desktop/src/lib/components/WalletPanel.svelte
@@ -2,11 +2,11 @@
   import { onMount } from 'svelte';
   import { invoke } from '@tauri-apps/api/core';
 
-  let wallet: any = null;
-  let balance: number = 0;
-  let karma: number = 0;
-  let loading = true;
-  let error = "";
+  let wallet: any = $state(null);
+  let balance: number = $state(0);
+  let karma: number = $state(0);
+  let loading = $state(true);
+  let error = $state("");
 
   async function loadWallet() {
     try {
@@ -42,8 +42,8 @@
 
   // Derived state
   // Logic: Red < 20, Green > 50, Gold > 80
-  $: karmaLevel = karma < 20 ? 'critical' : karma > 80 ? 'ascended' : karma > 50 ? 'good' : 'normal';
-  $: multiplier = karma < 20 ? '0.1x' : karma > 80 ? '5.0x' : '1.0x - 4.9x';
+  let karmaLevel = $derived(karma < 20 ? 'critical' : karma > 80 ? 'ascended' : karma > 50 ? 'good' : 'normal');
+  let multiplier = $derived(karma < 20 ? '0.1x' : karma > 80 ? '5.0x' : '1.0x - 4.9x');
 </script>
 
 <div class="p-6 bg-zinc-900/50 rounded-xl border border-zinc-700/50 backdrop-blur-sm relative overflow-hidden group">
@@ -140,7 +140,7 @@
             </div>
         </div>
 
-        <button on:click={handleFaucet}
+        <button onclick={handleFaucet}
             class="px-4 py-2 bg-emerald-600/20 hover:bg-emerald-600/40 text-emerald-400 border border-emerald-500/50 rounded text-sm transition-colors uppercase font-bold tracking-wider">
             Claim Faucet
         </button>
diff --git a/apps/desktop/src/lib/components/shell/Sidebar.svelte b/apps/desktop/src/lib/components/shell/Sidebar.svelte
index 01838ff8..2510e82e 100644
--- a/apps/desktop/src/lib/components/shell/Sidebar.svelte
+++ b/apps/desktop/src/lib/components/shell/Sidebar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  export let activeView: 'terminal' | 'cortex' | 'swarm' | 'wallet' | 'dojo' = 'terminal';
+  let { activeView = $bindable('terminal') }: { activeView: 'terminal' | 'cortex' | 'swarm' | 'wallet' | 'dojo' } = $props();
 
   const navItems = [
     { id: 'terminal', label: 'TERMINAL', icon: '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="4 17 10 11 4 5"></polyline><line x1="12" y1="19" x2="20" y2="19"></line></svg>', color: 'cyber-cyan' },
@@ -20,7 +20,7 @@
     {#each navItems as item}
       <button
         class="flex flex-col items-center gap-1 p-2 w-full transition-all duration-300 group"
-        on:click={() => activeView = item.id as 'terminal' | 'cortex' | 'swarm' | 'wallet' | 'dojo'}
+        onclick={() => activeView = item.id as 'terminal' | 'cortex' | 'swarm' | 'wallet' | 'dojo'}
       >
         <div class="w-8 h-8 flex items-center justify-center rounded transition-colors {activeView === item.id ? `text-${item.color}` : 'text-gray-600 group-hover:text-gray-400'}">
           {@html item.icon}
diff --git a/apps/desktop/src/lib/components/shell/Titlebar.svelte b/apps/desktop/src/lib/components/shell/Titlebar.svelte
index c95e3d05..00f9b607 100644
--- a/apps/desktop/src/lib/components/shell/Titlebar.svelte
+++ b/apps/desktop/src/lib/components/shell/Titlebar.svelte
@@ -26,13 +26,13 @@
 
   <!-- Window Controls -->
   <div class="flex items-center gap-2">
-    <button aria-label="Minimize Window" on:click={minimizeWindow} class="w-6 h-6 rounded-full bg-gray-800 hover:bg-yellow-500 flex items-center justify-center transition-colors">
+    <button aria-label="Minimize Window" onclick={minimizeWindow} class="w-6 h-6 rounded-full bg-gray-800 hover:bg-yellow-500 flex items-center justify-center transition-colors">
       <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="5" y1="12" x2="19" y2="12"></line></svg>
     </button>
-    <button aria-label="Maximize Window" on:click={toggleMaximizeWindow} class="w-6 h-6 rounded-full bg-gray-800 hover:bg-green-500 flex items-center justify-center transition-colors">
+    <button aria-label="Maximize Window" onclick={toggleMaximizeWindow} class="w-6 h-6 rounded-full bg-gray-800 hover:bg-green-500 flex items-center justify-center transition-colors">
        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2" ry="2"></rect></svg>
     </button>
-    <button aria-label="Close Window" on:click={closeWindow} class="w-6 h-6 rounded-full bg-gray-800 hover:bg-red-500 flex items-center justify-center transition-colors">
+    <button aria-label="Close Window" onclick={closeWindow} class="w-6 h-6 rounded-full bg-gray-800 hover:bg-red-500 flex items-center justify-center transition-colors">
       <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>
     </button>
   </div>
diff --git a/apps/desktop/src/routes/+page.svelte b/apps/desktop/src/routes/+page.svelte
index 4de1ce53..10470abb 100644
--- a/apps/desktop/src/routes/+page.svelte
+++ b/apps/desktop/src/routes/+page.svelte
@@ -8,7 +8,7 @@
   import Sidebar from '$lib/components/shell/Sidebar.svelte';
   import Titlebar from '$lib/components/shell/Titlebar.svelte';
 
-  let activeView: 'terminal' | 'cortex' | 'swarm' | 'wallet' | 'dojo' = 'terminal';
+  let activeView: 'terminal' | 'cortex' | 'swarm' | 'wallet' | 'dojo' = $state('terminal');
 </script>
 
 <svelte:head>
@@ -48,6 +48,6 @@
     </main>
   </div>
 
-  <Sidebar bind:activeView />
+  <Sidebar bind:activeView={activeView} />
 
 </div>