diff --git a/v2/src/App.svelte b/v2/src/App.svelte
index b4fa70b..6d9ecf6 100644
--- a/v2/src/App.svelte
+++ b/v2/src/App.svelte
@@ -8,8 +8,6 @@
   // Workspace components
   import GlobalTabBar from './lib/components/Workspace/GlobalTabBar.svelte';
   import ProjectGrid from './lib/components/Workspace/ProjectGrid.svelte';
-  import DocsTab from './lib/components/Workspace/DocsTab.svelte';
-  import ContextTab from './lib/components/Workspace/ContextTab.svelte';
   import SettingsTab from './lib/components/Workspace/SettingsTab.svelte';
   import CommandPalette from './lib/components/Workspace/CommandPalette.svelte';
 
@@ -32,28 +30,17 @@
   let panelContentEl: HTMLElement | undefined = $state();
   let panelWidth = $state<string | undefined>(undefined);
 
-  // Panel titles
-  const panelTitles: Record<string, string> = {
-    sessions: 'Sessions',
-    docs: 'Documentation',
-    context: 'Context',
-    settings: 'Settings',
-  };
-
-  // Measure the panel content's natural width by finding the widest
-  // nowrap element or element with min-width, then sizing the drawer to fit.
+  // Measure the panel content's natural width
   $effect(() => {
     const el = panelContentEl;
     void activeTab;
     if (!el) { panelWidth = undefined; return; }
     const frame = requestAnimationFrame(() => {
-      // Find all elements that define intrinsic width (nowrap text, inputs, etc.)
       let maxW = 0;
-      const candidates = el.querySelectorAll('[style*="white-space"], h3, h4, input, .settings-list, .settings-tab, .docs-tab, .context-tab');
+      const candidates = el.querySelectorAll('[style*="white-space"], h3, h4, input, .settings-list, .settings-tab');
       for (const c of candidates) {
         maxW = Math.max(maxW, c.scrollWidth);
       }
-      // Also check the direct child's min-width
       const child = el.firstElementChild as HTMLElement;
       if (child) {
         const cs = getComputedStyle(child);
@@ -61,7 +48,6 @@
         if (!isNaN(mw)) maxW = Math.max(maxW, mw);
       }
       if (maxW > 0) {
-        // Add padding for panel-content's own padding
         panelWidth = `${maxW + 24}px`;
       }
     });
@@ -88,23 +74,6 @@
         return;
       }
 
-      // Alt+1..4 — switch sidebar tab (and open drawer)
-      if (e.altKey && !e.ctrlKey && e.key >= '1' && e.key <= '4') {
-        e.preventDefault();
-        const tabs = ['sessions', 'docs', 'context', 'settings'] as const;
-        const idx = parseInt(e.key) - 1;
-        if (idx < tabs.length) {
-          const tab = tabs[idx];
-          if (getActiveTab() === tab && drawerOpen) {
-            drawerOpen = false;
-          } else {
-            setActiveTab(tab);
-            drawerOpen = true;
-          }
-        }
-        return;
-      }
-
       // Ctrl+1..5 — focus project by index
       if (e.ctrlKey && !e.shiftKey && e.key >= '1' && e.key <= '5') {
         e.preventDefault();
@@ -176,7 +145,7 @@
       {#if drawerOpen}
         <aside class="sidebar-panel" style:width={panelWidth}>
           <div class="panel-header">
-            <h2>{panelTitles[activeTab] ?? ''}</h2>
+            <h2>Settings</h2>
             <button class="panel-close" onclick={() => drawerOpen = false} title="Close sidebar (Ctrl+B)">
               <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
                 <path d="M2 2l10 10M12 2L2 12" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
@@ -184,15 +153,7 @@
             </button>
           </div>
           <div class="panel-content" bind:this={panelContentEl}>
-            {#if activeTab === 'sessions'}
-              <ProjectGrid />
-            {:else if activeTab === 'docs'}
-              <DocsTab />
-            {:else if activeTab === 'context'}
-              <ContextTab />
-            {:else if activeTab === 'settings'}
-              <SettingsTab />
-            {/if}
+            <SettingsTab />
           </div>
         </aside>
       {/if}
diff --git a/v2/src/lib/components/Markdown/MarkdownPane.svelte b/v2/src/lib/components/Markdown/MarkdownPane.svelte
index dd128bd..2bca285 100644
--- a/v2/src/lib/components/Markdown/MarkdownPane.svelte
+++ b/v2/src/lib/components/Markdown/MarkdownPane.svelte
@@ -15,6 +15,8 @@
   let renderedHtml = $state('');
   let error = $state('');
   let unlisten: (() => void) | undefined;
+  let currentWatchPath = $state<string | null>(null);
+  let highlighterReady = $state(false);
 
   const renderer = new Renderer();
   renderer.code = function({ text, lang }: { text: string; lang?: string }) {
@@ -34,11 +36,27 @@
     }
   }
 
+  // React to filePath changes — re-watch the new file
+  $effect(() => {
+    if (!highlighterReady) return;
+    const path = filePath;
+    if (path === currentWatchPath) return;
+
+    // Unwatch previous file
+    if (currentWatchPath) {
+      unwatchFile(paneId).catch(() => {});
+    }
+
+    currentWatchPath = path;
+    watchFile(paneId, path)
+      .then(content => renderMarkdown(content))
+      .catch(e => { error = `Failed to open file: ${e}`; });
+  });
+
   onMount(async () => {
     try {
       await getHighlighter();
-      const content = await watchFile(paneId, filePath);
-      renderMarkdown(content);
+      highlighterReady = true;
 
       unlisten = await onFileChanged((payload: FileChangedPayload) => {
         if (payload.pane_id === paneId) {
@@ -46,7 +64,7 @@
         }
       });
     } catch (e) {
-      error = `Failed to open file: ${e}`;
+      error = `Failed to initialize: ${e}`;
     }
   });
 
@@ -72,78 +90,98 @@
     display: flex;
     flex-direction: column;
     height: 100%;
-    background: var(--bg-primary);
-    color: var(--text-primary);
+    background: var(--ctp-base);
+    color: var(--ctp-text);
   }
 
   .markdown-body {
     flex: 1;
     overflow-y: auto;
-    padding: 16px 20px;
-    font-size: 14px;
-    line-height: 1.6;
+    padding: 1.25rem 1.5rem;
+    font-family: var(--ui-font-family, sans-serif);
+    font-size: 0.875rem;
+    line-height: 1.7;
   }
 
   .markdown-body :global(h1) {
     font-size: 1.6em;
     font-weight: 700;
-    margin: 0.8em 0 0.4em;
+    margin: 1em 0 0.5em;
     color: var(--ctp-lavender);
-    border-bottom: 1px solid var(--border);
+    border-bottom: 1px solid var(--ctp-surface1);
     padding-bottom: 0.3em;
   }
 
   .markdown-body :global(h2) {
     font-size: 1.3em;
     font-weight: 600;
-    margin: 0.7em 0 0.3em;
+    margin: 0.9em 0 0.4em;
     color: var(--ctp-blue);
   }
 
   .markdown-body :global(h3) {
     font-size: 1.1em;
     font-weight: 600;
-    margin: 0.6em 0 0.3em;
+    margin: 0.8em 0 0.3em;
     color: var(--ctp-sapphire);
   }
 
+  .markdown-body :global(h4) {
+    font-size: 1em;
+    font-weight: 600;
+    margin: 0.6em 0 0.3em;
+    color: var(--ctp-teal);
+  }
+
   .markdown-body :global(p) {
-    margin: 0.5em 0;
+    margin: 0.6em 0;
+  }
+
+  .markdown-body :global(strong) {
+    color: var(--ctp-text);
+    font-weight: 600;
+  }
+
+  .markdown-body :global(em) {
+    color: var(--ctp-subtext1);
   }
 
   .markdown-body :global(code) {
-    background: var(--bg-surface);
-    padding: 1px 5px;
-    border-radius: 3px;
-    font-family: var(--font-mono);
-    font-size: 0.9em;
+    background: var(--ctp-surface0);
+    padding: 0.125em 0.375em;
+    border-radius: 0.25em;
+    font-family: var(--term-font-family, 'JetBrains Mono', monospace);
+    font-size: 0.85em;
     color: var(--ctp-green);
   }
 
   .markdown-body :global(pre) {
-    background: var(--bg-surface);
-    padding: 12px 14px;
-    border-radius: var(--border-radius);
+    background: var(--ctp-mantle);
+    padding: 0.875rem 1rem;
+    border-radius: 0.375rem;
+    border: 1px solid var(--ctp-surface0);
     overflow-x: auto;
-    font-size: 12px;
-    line-height: 1.5;
-    margin: 0.6em 0;
+    font-size: 0.8rem;
+    line-height: 1.55;
+    margin: 0.75em 0;
   }
 
   .markdown-body :global(pre code) {
     background: none;
     padding: 0;
-    color: var(--text-primary);
+    color: var(--ctp-text);
+    font-size: inherit;
   }
 
   .markdown-body :global(.shiki) {
-    background: var(--bg-surface) !important;
-    padding: 12px 14px;
-    border-radius: var(--border-radius);
+    background: var(--ctp-mantle) !important;
+    padding: 0.875rem 1rem;
+    border-radius: 0.375rem;
+    border: 1px solid var(--ctp-surface0);
     overflow-x: auto;
-    font-size: 12px;
-    line-height: 1.5;
-    margin: 0.6em 0;
+    font-size: 0.8rem;
+    line-height: 1.55;
+    margin: 0.75em 0;
   }
 
   .markdown-body :global(.shiki code) {
@@ -153,70 +191,83 @@
 
   .markdown-body :global(blockquote) {
     border-left: 3px solid var(--ctp-mauve);
-    margin: 0.5em 0;
-    padding: 4px 12px;
-    color: var(--text-secondary);
+    margin: 0.75em 0;
+    padding: 0.375rem 1rem;
+    color: var(--ctp-subtext0);
+    background: color-mix(in srgb, var(--ctp-surface0) 30%, transparent);
+    border-radius: 0 0.25rem 0.25rem 0;
   }
 
   .markdown-body :global(ul), .markdown-body :global(ol) {
-    padding-left: 24px;
-    margin: 0.4em 0;
+    padding-left: 1.5rem;
+    margin: 0.5em 0;
   }
 
   .markdown-body :global(li) {
-    margin: 0.2em 0;
+    margin: 0.25em 0;
+  }
+
+  .markdown-body :global(li::marker) {
+    color: var(--ctp-overlay1);
   }
 
   .markdown-body :global(a) {
     color: var(--ctp-blue);
     text-decoration: none;
+    border-bottom: 1px solid transparent;
+    transition: border-color 0.15s;
   }
 
   .markdown-body :global(a:hover) {
-    text-decoration: underline;
+    border-bottom-color: var(--ctp-blue);
   }
 
   .markdown-body :global(table) {
     border-collapse: collapse;
     width: 100%;
-    margin: 0.5em 0;
-    font-size: 13px;
+    margin: 0.75em 0;
+    font-size: 0.825rem;
   }
 
   .markdown-body :global(th), .markdown-body :global(td) {
-    border: 1px solid var(--border);
-    padding: 6px 10px;
+    border: 1px solid var(--ctp-surface1);
+    padding: 0.4rem 0.75rem;
     text-align: left;
   }
 
   .markdown-body :global(th) {
-    background: var(--bg-surface);
+    background: var(--ctp-surface0);
     font-weight: 600;
+    color: var(--ctp-subtext1);
+  }
+
+  .markdown-body :global(tr:hover td) {
+    background: color-mix(in srgb, var(--ctp-surface0) 40%, transparent);
   }
 
   .markdown-body :global(hr) {
     border: none;
-    border-top: 1px solid var(--border);
-    margin: 1em 0;
+    border-top: 1px solid var(--ctp-surface1);
+    margin: 1.5em 0;
   }
 
   .markdown-body :global(img) {
     max-width: 100%;
-    border-radius: var(--border-radius);
+    border-radius: 0.375rem;
   }
 
   .file-path {
-    border-top: 1px solid var(--border);
-    padding: 4px 12px;
-    font-size: 10px;
-    font-family: var(--font-mono);
-    color: var(--text-muted);
+    border-top: 1px solid var(--ctp-surface0);
+    padding: 0.25rem 0.75rem;
+    font-size: 0.65rem;
+    font-family: var(--term-font-family, monospace);
+    color: var(--ctp-overlay0);
     flex-shrink: 0;
   }
 
   .error {
     color: var(--ctp-red);
-    padding: 16px;
-    font-size: 13px;
+    padding: 1rem;
+    font-size: 0.85rem;
   }
 </style>
diff --git a/v2/src/lib/components/Workspace/GlobalTabBar.svelte b/v2/src/lib/components/Workspace/GlobalTabBar.svelte
index 1cca548..5fce269 100644
--- a/v2/src/lib/components/Workspace/GlobalTabBar.svelte
+++ b/v2/src/lib/components/Workspace/GlobalTabBar.svelte
@@ -8,53 +8,36 @@
 
   let { expanded = false, ontoggle }: Props = $props();
 
-  const tabs: { id: WorkspaceTab; label: string; shortcut: string }[] = [
-    { id: 'sessions', label: 'Sessions', shortcut: 'Alt+1' },
-    { id: 'docs', label: 'Docs', shortcut: 'Alt+2' },
-    { id: 'context', label: 'Context', shortcut: 'Alt+3' },
-    { id: 'settings', label: 'Settings', shortcut: 'Ctrl+,' },
-  ];
+  const settingsIcon = 'M10.3 2L9.9 4.4a7 7 0 0 0-1.8 1l-2.2-.9-1.7 3 1.8 1.5a7 7 0 0 0 0 2l-1.8 1.5 1.7 3 2.2-.9a7 7 0 0 0 1.8 1L10.3 18h3.4l.4-2.4a7 7 0 0 0 1.8-1l2.2.9 1.7-3-1.8-1.5a7 7 0 0 0 0-2l1.8-1.5-1.7-3-2.2.9a7 7 0 0 0-1.8-1L13.7 2h-3.4zM12 8a4 4 0 1 1 0 8 4 4 0 0 1 0-8z';
 
-  // SVG icon paths for each tab
-  const icons: Record<WorkspaceTab, string> = {
-    sessions: 'M3 3h7v7H3zM14 3h7v7h-7zM3 14h7v7H3zM14 14h7v7h-7z',
-    docs: 'M6 2h9l5 5v15H4V2h2zm8 0v5h5M8 12h8M8 16h5',
-    context: 'M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm0 5v5l3 3',
-    settings: 'M10.3 2L9.9 4.4a7 7 0 0 0-1.8 1l-2.2-.9-1.7 3 1.8 1.5a7 7 0 0 0 0 2l-1.8 1.5 1.7 3 2.2-.9a7 7 0 0 0 1.8 1L10.3 18h3.4l.4-2.4a7 7 0 0 0 1.8-1l2.2.9 1.7-3-1.8-1.5a7 7 0 0 0 0-2l1.8-1.5-1.7-3-2.2.9a7 7 0 0 0-1.8-1L13.7 2h-3.4zM12 8a4 4 0 1 1 0 8 4 4 0 0 1 0-8z',
-  };
-
-  function handleTabClick(id: WorkspaceTab) {
-    const current = getActiveTab();
-    if (current === id && expanded) {
-      // Clicking active tab again collapses
+  function handleSettingsClick() {
+    if (getActiveTab() === 'settings' && expanded) {
       ontoggle?.();
     } else {
-      setActiveTab(id);
+      setActiveTab('settings');
       if (!expanded) ontoggle?.();
     }
   }
 </script>
 
 <nav class="sidebar-rail">
-  {#each tabs as tab}
-    <button
-      class="rail-btn"
-      class:active={getActiveTab() === tab.id && expanded}
-      onclick={() => handleTabClick(tab.id)}
-      title="{tab.label} ({tab.shortcut})"
-    >
-      <svg width="20" height="20" viewBox="0 0 24 24" fill="none">
-        <path
-          d={icons[tab.id]}
-          stroke="currentColor"
-          stroke-width="1.5"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          fill="none"
-        />
-      </svg>
-    </button>
-  {/each}
+  <button
+    class="rail-btn"
+    class:active={getActiveTab() === 'settings' && expanded}
+    onclick={handleSettingsClick}
+    title="Settings (Ctrl+,)"
+  >
+    <svg width="20" height="20" viewBox="0 0 24 24" fill="none">
+      <path
+        d={settingsIcon}
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        fill="none"
+      />
+    </svg>
+  </button>
 </nav>
 
 <style>
diff --git a/v2/src/lib/components/Workspace/ProjectBox.svelte b/v2/src/lib/components/Workspace/ProjectBox.svelte
index bacad04..ef1df20 100644
--- a/v2/src/lib/components/Workspace/ProjectBox.svelte
+++ b/v2/src/lib/components/Workspace/ProjectBox.svelte
@@ -73,15 +73,17 @@
     {/if}
   </div>
 
-  <div class="project-terminal-area">
-    <TerminalTabs {project} agentSessionId={mainSessionId} />
-  </div>
+  {#if activeTab === 'claude'}
+    <div class="project-terminal-area">
+      <TerminalTabs {project} agentSessionId={mainSessionId} />
+    </div>
+  {/if}
 </div>
 
 <style>
   .project-box {
     display: grid;
-    grid-template-rows: auto auto 1fr auto;
+    grid-template-rows: auto auto 1fr;
     min-width: 30rem;
     scroll-snap-align: start;
     background: var(--ctp-base);