From 83a66d0a6d30932205e356899f9ec7fe96dc779b Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Thu, 30 Jul 2026 16:36:20 +0300
Subject: [PATCH] feat(theme): add OpenChamber hybrid theme and make it the
 default

- Add OpenChamber brand theme (dark+light): Vitesse syntax over OpenCode-deep neutrals with Flexoki accents, harmonized in OKLCH

- Add scripts/harmonize-theme.mjs: align accent saturation/lightness and boost syntax chroma via OKLCH

- Set default theme to OpenChamber (was Flexoki)

- Rename fields-of-the-shire off the openchamber-* id; keep it as a normal preset

- Remove OpenCode and OC-2 ports and all disabled theme JSON definitions

- Make panel/header/sidebar borders opaque and theme-driven; global default border now uses --border instead of hardcoded rgba
---
 .../ui/src/components/layout/ContextPanel.tsx |  14 +-
 .../ui/src/components/layout/MainLayout.tsx   |   6 +-
 packages/ui/src/components/layout/Sidebar.tsx |   2 +-
 .../ui/src/lib/theme/themes/amoled-dark.json  | 427 ------------------
 .../ui/src/lib/theme/themes/amoled-light.json | 427 ------------------
 .../ui/src/lib/theme/themes/aura-dark.json    |   2 +-
 .../ui/src/lib/theme/themes/ayu-dark.json     |   2 +-
 .../ui/src/lib/theme/themes/ayu-light.json    |   2 +-
 .../src/lib/theme/themes/carbonfox-dark.json  |   2 +-
 .../src/lib/theme/themes/carbonfox-light.json |   4 +-
 .../src/lib/theme/themes/catppuccin-dark.json |   2 +-
 .../lib/theme/themes/catppuccin-light.json    |   6 +-
 .../ui/src/lib/theme/themes/cursor-dark.json  | 427 ------------------
 .../ui/src/lib/theme/themes/cursor-light.json | 427 ------------------
 .../ui/src/lib/theme/themes/dracula-dark.json |   4 +-
 .../themes/fields-of-the-shire-dark.json      |   6 +-
 .../themes/fields-of-the-shire-light.json     |   4 +-
 .../ui/src/lib/theme/themes/flexoki-dark.json |   2 +-
 .../src/lib/theme/themes/flexoki-light.json   |   2 +-
 .../ui/src/lib/theme/themes/github-dark.json  | 427 ------------------
 .../ui/src/lib/theme/themes/github-light.json | 427 ------------------
 .../ui/src/lib/theme/themes/gruvbox-dark.json |   4 +-
 .../src/lib/theme/themes/gruvbox-light.json   |  10 +-
 packages/ui/src/lib/theme/themes/index.ts     |   8 +-
 .../src/lib/theme/themes/jetbrains-dark.json  |   6 +-
 .../src/lib/theme/themes/jetbrains-light.json |   6 +-
 .../src/lib/theme/themes/kanagawa-dark.json   |   8 +-
 .../src/lib/theme/themes/kanagawa-light.json  |  18 +-
 .../lib/theme/themes/lucent-orng-dark.json    | 427 ------------------
 .../lib/theme/themes/lucent-orng-light.json   | 427 ------------------
 .../ui/src/lib/theme/themes/mono-dark.json    |   2 +-
 .../ui/src/lib/theme/themes/mono-light.json   |   2 +-
 .../src/lib/theme/themes/mono-plus-dark.json  |   2 +-
 .../src/lib/theme/themes/mono-plus-light.json |   2 +-
 .../ui/src/lib/theme/themes/monokai-dark.json |   2 +-
 .../src/lib/theme/themes/nightowl-dark.json   |   4 +-
 .../src/lib/theme/themes/nightowl-light.json  |   2 +-
 .../ui/src/lib/theme/themes/nord-dark.json    |   4 +-
 .../ui/src/lib/theme/themes/nord-light.json   |   4 +-
 .../ui/src/lib/theme/themes/oc-2-dark.json    | 427 ------------------
 .../ui/src/lib/theme/themes/oc-2-light.json   | 427 ------------------
 .../src/lib/theme/themes/onedarkpro-dark.json |   4 +-
 .../lib/theme/themes/onedarkpro-light.json    |   4 +-
 .../lib/theme/themes/openchamber-dark.json    | 177 ++++++++
 .../lib/theme/themes/openchamber-light.json   | 177 ++++++++
 .../ui/src/lib/theme/themes/orng-dark.json    | 427 ------------------
 .../ui/src/lib/theme/themes/orng-light.json   | 427 ------------------
 packages/ui/src/lib/theme/themes/presets.ts   |  48 +-
 .../src/lib/theme/themes/rosepine-dark.json   | 427 ------------------
 .../src/lib/theme/themes/rosepine-light.json  | 427 ------------------
 .../lib/theme/themes/shadesofpurple-dark.json | 427 ------------------
 .../theme/themes/shadesofpurple-light.json    | 427 ------------------
 .../src/lib/theme/themes/solarized-dark.json  |   4 +-
 .../src/lib/theme/themes/tokyonight-dark.json |   8 +-
 .../lib/theme/themes/tokyonight-light.json    |   2 +-
 .../ui/src/lib/theme/themes/vercel-dark.json  | 427 ------------------
 .../ui/src/lib/theme/themes/vercel-light.json | 427 ------------------
 .../ui/src/lib/theme/themes/vesper-dark.json  |   4 +-
 .../ui/src/lib/theme/themes/vesper-light.json |   4 +-
 .../lib/theme/themes/vitesse-dark-dark.json   |   6 +-
 .../lib/theme/themes/vitesse-light-light.json |   6 +-
 .../ui/src/lib/theme/themes/zenburn-dark.json | 427 ------------------
 .../src/lib/theme/themes/zenburn-light.json   | 427 ------------------
 packages/ui/src/styles/design-system.css      |  10 +-
 scripts/harmonize-theme.mjs                   | 275 +++++++++++
 65 files changed, 727 insertions(+), 8686 deletions(-)
 delete mode 100644 packages/ui/src/lib/theme/themes/amoled-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/amoled-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/cursor-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/cursor-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/github-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/github-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/lucent-orng-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/lucent-orng-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/oc-2-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/oc-2-light.json
 create mode 100644 packages/ui/src/lib/theme/themes/openchamber-dark.json
 create mode 100644 packages/ui/src/lib/theme/themes/openchamber-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/orng-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/orng-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/rosepine-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/rosepine-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/shadesofpurple-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/shadesofpurple-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/vercel-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/vercel-light.json
 delete mode 100644 packages/ui/src/lib/theme/themes/zenburn-dark.json
 delete mode 100644 packages/ui/src/lib/theme/themes/zenburn-light.json
 create mode 100644 scripts/harmonize-theme.mjs

diff --git a/packages/ui/src/components/layout/ContextPanel.tsx b/packages/ui/src/components/layout/ContextPanel.tsx
index 7af914ff..3cc8e813 100644
--- a/packages/ui/src/components/layout/ContextPanel.tsx
+++ b/packages/ui/src/components/layout/ContextPanel.tsx
@@ -367,7 +367,7 @@ const EditorTreeColumn: React.FC<{ visible: boolean }> = ({ visible }) => {
     <div
       ref={columnRef}
       className={cn(
-        'relative h-full flex-shrink-0 overflow-hidden border-l border-border/40 bg-background will-change-[width] motion-reduce:transition-none',
+        'relative h-full flex-shrink-0 overflow-hidden border-l border-border bg-background will-change-[width] motion-reduce:transition-none',
         !visible && 'border-l-0',
       )}
       style={{
@@ -1248,7 +1248,7 @@ const PreviewPane: React.FC<PreviewPaneProps> = ({ rawUrl, onNavigate }) => {
 
   return (
     <div className="absolute inset-0 flex flex-col">
-      <div className="flex items-center gap-1 border-b border-border/40 bg-[var(--surface-background)] px-2 py-1">
+      <div className="flex items-center gap-1 border-b border-border bg-[var(--surface-background)] px-2 py-1">
         <div className="min-w-0 flex-1 truncate typography-micro text-muted-foreground" title={headerSrc || rawUrl}>
           {headerSrc || rawUrl || t('contextPanel.preview.empty')}
         </div>
@@ -1877,7 +1877,7 @@ const IframeBrowserPane: React.FC<DesktopBrowserPaneProps> = ({ initialUrl, dire
 
   return (
     <div className="absolute inset-0 flex flex-col bg-background">
-      <div className="flex items-center gap-1 border-b border-border/40 bg-[var(--surface-background)] px-2 py-1">
+      <div className="flex items-center gap-1 border-b border-border bg-[var(--surface-background)] px-2 py-1">
         <Button type="button" variant="ghost" size="sm" className="h-7 w-7 p-0" disabled={historyIndex <= 0} onClick={() => goToHistory(historyIndex - 1)}>
           <Icon name="arrow-left" className="h-3.5 w-3.5" />
         </Button>
@@ -2167,7 +2167,7 @@ const DesktopBrowserPane: React.FC<DesktopBrowserPaneProps> = ({ initialUrl, dir
 
   return (
     <div className="absolute inset-0 flex flex-col bg-background">
-      <div className="flex items-center gap-1 border-b border-border/40 bg-[var(--surface-background)] px-2 py-1">
+      <div className="flex items-center gap-1 border-b border-border bg-[var(--surface-background)] px-2 py-1">
         <Button type="button" variant="ghost" size="sm" className="h-7 w-7 p-0" onClick={() => { try { webviewRef.current?.goBack?.(); } catch { /* webview not ready */ } }}>
           <Icon name="arrow-left" className="h-3.5 w-3.5" />
         </Button>
@@ -2730,7 +2730,7 @@ export const ContextPanel: React.FC = () => {
   const isFileTabActive = activeTab?.mode === 'file';
 
   const header = (
-    <header className="flex h-10 items-stretch border-b border-border/40">
+    <header className="flex h-10 items-stretch border-b border-border">
       {isMultiInstanceMode ? (
         <SortableTabsStrip
           items={tabItems}
@@ -2854,11 +2854,11 @@ export const ContextPanel: React.FC = () => {
           content box only while collapsed, shifting the header controls by
           1px between the collapsed and expanded states. */}
       {isOpen && !isExpanded && (
-        <div aria-hidden="true" className="absolute left-0 top-0 z-40 h-full w-px bg-border/40" />
+        <div aria-hidden="true" className="absolute left-0 top-0 z-40 h-full w-px bg-border" />
       )}
       {/* Divider between the panel and the icon rail on its right. */}
       {isOpen && (
-        <div aria-hidden="true" className="absolute right-0 top-0 z-40 h-full w-px bg-border/40" />
+        <div aria-hidden="true" className="absolute right-0 top-0 z-40 h-full w-px bg-border" />
       )}
       {!isExpanded && (
         <div
diff --git a/packages/ui/src/components/layout/MainLayout.tsx b/packages/ui/src/components/layout/MainLayout.tsx
index b2f8100b..ba827b95 100644
--- a/packages/ui/src/components/layout/MainLayout.tsx
+++ b/packages/ui/src/components/layout/MainLayout.tsx
@@ -414,7 +414,7 @@ export const MainLayout: React.FC = () => {
                         <Sidebar
                             isOpen={isSidebarOpen}
                             isMobile={isMobile}
-                            className="border-border/50"
+                            className="border-border"
                             topBar={<SidebarTopBar />}
                         >
                             <SessionSidebar isVisible={isSidebarOpen} />
@@ -422,7 +422,7 @@ export const MainLayout: React.FC = () => {
                         <div className="relative flex flex-1 min-w-0 flex-col overflow-hidden bg-background" data-page-scroll-lock="true">
                             <Header />
                             <div className="relative flex flex-1 min-h-0 overflow-hidden bg-background" data-page-scroll-lock="true">
-                                <div className="relative flex flex-1 min-w-0 flex-col overflow-hidden border-t border-border/50 bg-background" data-page-scroll-lock="true">
+                                <div className="relative flex flex-1 min-w-0 flex-col overflow-hidden border-t border-border bg-background" data-page-scroll-lock="true">
                                     <div className="flex flex-1 min-h-0 overflow-hidden" data-page-scroll-lock="true">
                                         <div className="relative flex flex-1 min-h-0 min-w-0 overflow-hidden" data-page-scroll-lock="true">
                                             <main className="flex-1 overflow-hidden bg-background relative" data-page-scroll-lock="true">
@@ -456,7 +456,7 @@ export const MainLayout: React.FC = () => {
                                         </div>
                                     </div>
                                 </div>
-                                <div className="border-t border-border/50" data-page-scroll-lock="true">
+                                <div className="border-t border-border" data-page-scroll-lock="true">
                                     <ErrorBoundary><ContextPanelRail /></ErrorBoundary>
                                 </div>
                             </div>
diff --git a/packages/ui/src/components/layout/Sidebar.tsx b/packages/ui/src/components/layout/Sidebar.tsx
index 4b8636d1..b867598b 100644
--- a/packages/ui/src/components/layout/Sidebar.tsx
+++ b/packages/ui/src/components/layout/Sidebar.tsx
@@ -126,7 +126,7 @@ export const Sidebar: React.FC<SidebarProps> = ({ isOpen, isMobile, children, cl
         <aside
             ref={sidebarRef}
             className={cn(
-                'relative flex h-full overflow-hidden border-r border-border/40 will-change-[width] motion-reduce:transition-none',
+                'relative flex h-full overflow-hidden border-r border-border will-change-[width] motion-reduce:transition-none',
                 'bg-sidebar oc-vibrancy-surface',
                 isOpen && 'shadow-[inset_-2px_0_10px_-2px_rgb(0_0_0_/_0.06)]',
                 !isOpen && 'border-r-0',
diff --git a/packages/ui/src/lib/theme/themes/amoled-dark.json b/packages/ui/src/lib/theme/themes/amoled-dark.json
deleted file mode 100644
index 43dc52ad..00000000
--- a/packages/ui/src/lib/theme/themes/amoled-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "amoled-dark",
-    "name": "AMOLED",
-    "description": "Ported from OpenCode AMOLED theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "amoled"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#954af5",
-      "hover": "#9f66f4",
-      "active": "#531195",
-      "foreground": "#ffffff",
-      "muted": "#954af580",
-      "emphasis": "#954af5"
-    },
-    "surface": {
-      "background": "#000000",
-      "foreground": "#ffffff",
-      "muted": "#111111",
-      "mutedForeground": "#dbdbdb",
-      "elevated": "#0a0a0a",
-      "elevatedForeground": "#ffffff",
-      "overlay": "#000000cc",
-      "subtle": "#111111"
-    },
-    "interactive": {
-      "border": "#434343",
-      "borderHover": "#4e4e4e",
-      "borderFocus": "#531195",
-      "selection": "#ffffff1f",
-      "selectionForeground": "#ffffff",
-      "focus": "#531195",
-      "focusRing": "#53119561",
-      "cursor": "#ffffff",
-      "hover": "#ffffff17",
-      "active": "#ffffff1f"
-    },
-    "status": {
-      "error": "#c71133",
-      "errorForeground": "#ffffff",
-      "errorBackground": "#5d0212",
-      "errorBorder": "#7d081d",
-      "warning": "#c49925",
-      "warningForeground": "#151313",
-      "warningBackground": "#353003",
-      "warningBorder": "#494308",
-      "success": "#2bbd69",
-      "successForeground": "#151313",
-      "successBackground": "#08391c",
-      "successBorder": "#025027",
-      "info": "#24b6b6",
-      "infoForeground": "#151313",
-      "infoBackground": "#063636",
-      "infoBorder": "#0f4b4b"
-    },
-    "pr": {
-      "open": "#2bbd69",
-      "draft": "#dbdbdb",
-      "blocked": "#c49925",
-      "merged": "#18ffff",
-      "closed": "#c71133"
-    },
-    "syntax": {
-      "base": {
-        "background": "#0a0a0a",
-        "foreground": "#ffffff",
-        "comment": "#555555",
-        "keyword": "#ff00ff",
-        "string": "#00ff88",
-        "number": "#18ffff",
-        "function": "#ffea00",
-        "variable": "#ffffff",
-        "type": "#fef5a2",
-        "operator": "#dbdbdb"
-      },
-      "tokens": {
-        "commentDoc": "#555555",
-        "stringEscape": "#ffffff",
-        "keywordImport": "#ff00ff",
-        "storageModifier": "#ff00ff",
-        "functionCall": "#ffea00",
-        "method": "#ffea00",
-        "variableProperty": "#ffea00",
-        "variableOther": "#ffffff",
-        "variableGlobal": "#18ffff",
-        "variableLocal": "#dbdbdb",
-        "parameter": "#ffffff",
-        "constant": "#18ffff",
-        "class": "#fef5a2",
-        "className": "#fef5a2",
-        "interface": "#fef5a2",
-        "struct": "#fef5a2",
-        "enum": "#fef5a2",
-        "typeParameter": "#fef5a2",
-        "namespace": "#fef5a2",
-        "module": "#ff00ff",
-        "tag": "#ff00ff",
-        "jsxTag": "#ff00ff",
-        "tagAttribute": "#ffea00",
-        "tagAttributeValue": "#00ff88",
-        "boolean": "#18ffff",
-        "decorator": "#ff00ff",
-        "label": "#ffea00",
-        "punctuation": "#dbdbdb",
-        "macro": "#ff00ff",
-        "preprocessor": "#ff00ff",
-        "regex": "#ffffff",
-        "url": "#954af5",
-        "key": "#ffea00",
-        "exception": "#c71133"
-      },
-      "highlights": {
-        "diffAdded": "#92fdb3",
-        "diffAddedBackground": "#011406",
-        "diffRemoved": "#f20e3f",
-        "diffRemovedBackground": "#230204",
-        "diffModified": "#fef5a2",
-        "diffModifiedBackground": "#1f1b27",
-        "lineNumber": "#dbdbdb",
-        "lineNumberActive": "#ffffff"
-      }
-    },
-    "header": {
-      "background": "#000000",
-      "foreground": "#ffffff",
-      "border": "#434343",
-      "icon": "#dbdbdb",
-      "hover": "#ffffff17"
-    },
-    "sidebar": {
-      "background": "#111111",
-      "foreground": "#dbdbdb",
-      "border": "#434343",
-      "icon": "#dbdbdb",
-      "hover": "#ffffff17",
-      "active": "#ffffff1f",
-      "accent": "#954af5",
-      "accentForeground": "#ffffff"
-    },
-    "chat": {
-      "background": "#000000",
-      "userMessage": "#ffffff",
-      "userMessageBackground": "#0a0a0a",
-      "assistantMessage": "#ffffff",
-      "assistantMessageBackground": "#000000",
-      "timestamp": "#dbdbdb",
-      "divider": "#434343",
-      "typing": "#dbdbdb"
-    },
-    "markdown": {
-      "heading1": "#954af5",
-      "heading2": "#954af5",
-      "heading3": "#ffffff",
-      "heading4": "#ffffff",
-      "link": "#954af5",
-      "linkHover": "#9f66f4",
-      "inlineCode": "#2bbd69",
-      "inlineCodeBackground": "#111111",
-      "blockquote": "#dbdbdb",
-      "blockquoteBorder": "#434343",
-      "listMarker": "#954af599",
-      "bold": "#ffffff",
-      "italic": "#dbdbdb",
-      "strikethrough": "#dbdbdb",
-      "hr": "#434343"
-    },
-    "tools": {
-      "background": "#111111",
-      "border": "#434343",
-      "headerHover": "#ffffff17",
-      "icon": "#dbdbdb",
-      "title": "#ffffff",
-      "description": "#dbdbdb",
-      "edit": {
-        "added": "#92fdb3",
-        "addedBackground": "#011406",
-        "removed": "#f20e3f",
-        "removedBackground": "#230204",
-        "modified": "#fef5a2",
-        "modifiedBackground": "#1f1b27",
-        "lineNumber": "#dbdbdb"
-      },
-      "bash": {
-        "background": "#0a0a0a",
-        "foreground": "#ffffff",
-        "info": "#24b6b6",
-        "warning": "#c49925",
-        "error": "#c71133"
-      },
-      "lsp": {
-        "background": "#0a0a0a",
-        "foreground": "#ffffff",
-        "info": "#24b6b6",
-        "warning": "#c49925",
-        "error": "#c71133"
-      }
-    },
-    "forms": {
-      "inputBackground": "#0a0a0a",
-      "inputForeground": "#ffffff",
-      "inputBorder": "#434343",
-      "inputBorderHover": "#4e4e4e",
-      "inputBorderFocus": "#531195",
-      "inputPlaceholder": "#dbdbdb",
-      "inputDisabled": "#111111",
-      "inputSelection": "#ffffff1f",
-      "label": "#dbdbdb",
-      "helperText": "#dbdbdb"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#954af5",
-        "fg": "#ffffff",
-        "border": "#954af5",
-        "hover": "#9f66f4",
-        "active": "#531195",
-        "disabled": "#111111"
-      },
-      "secondary": {
-        "bg": "#0a0a0a",
-        "fg": "#ffffff",
-        "border": "#434343",
-        "hover": "#ffffff17",
-        "active": "#ffffff1f",
-        "disabled": "#111111"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#ffffff",
-        "border": "#00000000",
-        "hover": "#ffffff17",
-        "active": "#ffffff1f",
-        "disabled": "#dbdbdb"
-      },
-      "destructive": {
-        "bg": "#c71133",
-        "fg": "#ffffff",
-        "border": "#7d081d",
-        "hover": "#5d0212",
-        "active": "#c71133",
-        "disabled": "#111111"
-      }
-    },
-    "modal": {
-      "background": "#0a0a0a",
-      "foreground": "#ffffff",
-      "border": "#434343",
-      "overlay": "#000000d6"
-    },
-    "popover": {
-      "background": "#0a0a0a",
-      "foreground": "#ffffff",
-      "border": "#434343",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#0a0a0a",
-      "foreground": "#ffffff",
-      "border": "#434343",
-      "inputBackground": "#0a0a0a",
-      "selectedBackground": "#ffffff1f",
-      "selectedForeground": "#ffffff",
-      "muted": "#dbdbdb"
-    },
-    "fileAttachment": {
-      "background": "#111111",
-      "foreground": "#ffffff",
-      "border": "#434343",
-      "icon": "#dbdbdb",
-      "removeHover": "#5d0212"
-    },
-    "sessions": {
-      "background": "#000000",
-      "foreground": "#ffffff",
-      "mutedForeground": "#dbdbdb",
-      "border": "#434343",
-      "hover": "#ffffff17",
-      "active": "#ffffff1f"
-    },
-    "modelSelector": {
-      "background": "#0a0a0a",
-      "foreground": "#ffffff",
-      "border": "#434343",
-      "selectedBackground": "#ffffff1f",
-      "selectedForeground": "#ffffff"
-    },
-    "permissions": {
-      "background": "#0a0a0a",
-      "foreground": "#ffffff",
-      "border": "#434343",
-      "allow": "#2bbd69",
-      "allowBackground": "#08391c",
-      "deny": "#c71133",
-      "denyBackground": "#5d0212"
-    },
-    "loading": {
-      "spinner": "#954af5",
-      "spinnerTrack": "#111111",
-      "skeleton": "#111111",
-      "shimmer": "#ffffff17"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#ffffff33",
-      "thumbHover": "#ffffff57"
-    },
-    "badges": {
-      "default": {
-        "bg": "#111111",
-        "fg": "#ffffff",
-        "border": "#434343"
-      },
-      "info": {
-        "bg": "#063636",
-        "fg": "#24b6b6",
-        "border": "#0f4b4b"
-      },
-      "success": {
-        "bg": "#08391c",
-        "fg": "#2bbd69",
-        "border": "#025027"
-      },
-      "warning": {
-        "bg": "#353003",
-        "fg": "#c49925",
-        "border": "#494308"
-      },
-      "error": {
-        "bg": "#5d0212",
-        "fg": "#c71133",
-        "border": "#7d081d"
-      }
-    },
-    "toast": {
-      "background": "#0a0a0a",
-      "foreground": "#ffffff",
-      "border": "#434343",
-      "success": {
-        "background": "#08391c",
-        "foreground": "#2bbd69",
-        "border": "#025027"
-      },
-      "warning": {
-        "background": "#353003",
-        "foreground": "#c49925",
-        "border": "#494308"
-      },
-      "error": {
-        "background": "#5d0212",
-        "foreground": "#c71133",
-        "border": "#7d081d"
-      },
-      "info": {
-        "background": "#063636",
-        "foreground": "#24b6b6",
-        "border": "#0f4b4b"
-      }
-    },
-    "emptyState": {
-      "icon": "#dbdbdb",
-      "title": "#ffffff",
-      "description": "#dbdbdb",
-      "border": "#434343"
-    },
-    "table": {
-      "border": "#434343",
-      "headerBackground": "#0a0a0a",
-      "headerForeground": "#ffffff",
-      "rowHover": "#ffffff17",
-      "rowSelected": "#ffffff1f"
-    },
-    "charts": {
-      "series": [
-        "#954af5",
-        "#24b6b6",
-        "#2bbd69",
-        "#c49925",
-        "#c71133"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#531195",
-      "selection": "#ffffff1f",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #53119559"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/amoled-light.json b/packages/ui/src/lib/theme/themes/amoled-light.json
deleted file mode 100644
index 57a8b164..00000000
--- a/packages/ui/src/lib/theme/themes/amoled-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "amoled-light",
-    "name": "AMOLED",
-    "description": "Ported from OpenCode AMOLED theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "amoled"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#6209fd",
-      "hover": "#5806e6",
-      "active": "#babafa",
-      "foreground": "#ffffff",
-      "muted": "#6209fd80",
-      "emphasis": "#6209fd"
-    },
-    "surface": {
-      "background": "#f1f1f1",
-      "foreground": "#0a0a0a",
-      "muted": "#e3e3e3",
-      "mutedForeground": "#232323",
-      "elevated": "#eaeaea",
-      "elevatedForeground": "#0a0a0a",
-      "overlay": "#f1f1f133",
-      "subtle": "#e3e3e3"
-    },
-    "interactive": {
-      "border": "#b9b9b9",
-      "borderHover": "#ababab",
-      "borderFocus": "#babafa",
-      "selection": "#0a0a0a16",
-      "selectionForeground": "#0a0a0a",
-      "focus": "#babafa",
-      "focusRing": "#babafa47",
-      "cursor": "#0a0a0a",
-      "hover": "#0a0a0a0e",
-      "active": "#0a0a0a16"
-    },
-    "status": {
-      "error": "#ea1f40",
-      "errorForeground": "#000000",
-      "errorBackground": "#fee2e1",
-      "errorBorder": "#fea6a4",
-      "warning": "#fbac7c",
-      "warningForeground": "#000000",
-      "warningBackground": "#ffe6c6",
-      "warningBorder": "#fab141",
-      "success": "#20e679",
-      "successForeground": "#000000",
-      "successBackground": "#b4ffc7",
-      "successBorder": "#20e679",
-      "info": "#7fcbfd",
-      "infoForeground": "#000000",
-      "infoBackground": "#d8edfd",
-      "infoBorder": "#7fcbfd"
-    },
-    "pr": {
-      "open": "#20e679",
-      "draft": "#232323",
-      "blocked": "#fbac7c",
-      "merged": "#00b0ff",
-      "closed": "#ea1f40"
-    },
-    "syntax": {
-      "base": {
-        "background": "#eaeaea",
-        "foreground": "#0a0a0a",
-        "comment": "#757575",
-        "keyword": "#d500f9",
-        "string": "#00e676",
-        "number": "#00b0ff",
-        "function": "#ff9100",
-        "variable": "#010101",
-        "type": "#785110",
-        "operator": "#0a0a0a"
-      },
-      "tokens": {
-        "commentDoc": "#757575",
-        "stringEscape": "#0a0a0a",
-        "keywordImport": "#d500f9",
-        "storageModifier": "#d500f9",
-        "functionCall": "#ff9100",
-        "method": "#ff9100",
-        "variableProperty": "#ff9100",
-        "variableOther": "#010101",
-        "variableGlobal": "#00b0ff",
-        "variableLocal": "#0a0a0a",
-        "parameter": "#010101",
-        "constant": "#00b0ff",
-        "class": "#785110",
-        "className": "#785110",
-        "interface": "#785110",
-        "struct": "#785110",
-        "enum": "#785110",
-        "typeParameter": "#785110",
-        "namespace": "#785110",
-        "module": "#d500f9",
-        "tag": "#d500f9",
-        "jsxTag": "#d500f9",
-        "tagAttribute": "#ff9100",
-        "tagAttributeValue": "#00e676",
-        "boolean": "#00b0ff",
-        "decorator": "#d500f9",
-        "label": "#ff9100",
-        "punctuation": "#0a0a0a",
-        "macro": "#d500f9",
-        "preprocessor": "#d500f9",
-        "regex": "#0a0a0a",
-        "url": "#6209fd",
-        "key": "#ff9100",
-        "exception": "#ea1f40"
-      },
-      "highlights": {
-        "diffAdded": "#15733c",
-        "diffAddedBackground": "#f8fff9",
-        "diffRemoved": "#ea1f40",
-        "diffRemovedBackground": "#fffcfc",
-        "diffModified": "#785110",
-        "diffModifiedBackground": "#dddcea",
-        "lineNumber": "#232323",
-        "lineNumberActive": "#0a0a0a"
-      }
-    },
-    "header": {
-      "background": "#f1f1f1",
-      "foreground": "#0a0a0a",
-      "border": "#b9b9b9",
-      "icon": "#232323",
-      "hover": "#0a0a0a0e"
-    },
-    "sidebar": {
-      "background": "#e3e3e3",
-      "foreground": "#232323",
-      "border": "#b9b9b9",
-      "icon": "#232323",
-      "hover": "#0a0a0a0e",
-      "active": "#0a0a0a16",
-      "accent": "#6209fd",
-      "accentForeground": "#ffffff"
-    },
-    "chat": {
-      "background": "#f1f1f1",
-      "userMessage": "#0a0a0a",
-      "userMessageBackground": "#eaeaea",
-      "assistantMessage": "#0a0a0a",
-      "assistantMessageBackground": "#f1f1f1",
-      "timestamp": "#232323",
-      "divider": "#b9b9b9",
-      "typing": "#232323"
-    },
-    "markdown": {
-      "heading1": "#6209fd",
-      "heading2": "#6209fd",
-      "heading3": "#0a0a0a",
-      "heading4": "#0a0a0a",
-      "link": "#6209fd",
-      "linkHover": "#5806e6",
-      "inlineCode": "#20e679",
-      "inlineCodeBackground": "#e3e3e3",
-      "blockquote": "#232323",
-      "blockquoteBorder": "#b9b9b9",
-      "listMarker": "#6209fd99",
-      "bold": "#0a0a0a",
-      "italic": "#232323",
-      "strikethrough": "#232323",
-      "hr": "#b9b9b9"
-    },
-    "tools": {
-      "background": "#e3e3e3",
-      "border": "#b9b9b9",
-      "headerHover": "#0a0a0a0e",
-      "icon": "#232323",
-      "title": "#0a0a0a",
-      "description": "#232323",
-      "edit": {
-        "added": "#15733c",
-        "addedBackground": "#f8fff9",
-        "removed": "#ea1f40",
-        "removedBackground": "#fffcfc",
-        "modified": "#785110",
-        "modifiedBackground": "#dddcea",
-        "lineNumber": "#232323"
-      },
-      "bash": {
-        "background": "#eaeaea",
-        "foreground": "#0a0a0a",
-        "info": "#7fcbfd",
-        "warning": "#fbac7c",
-        "error": "#ea1f40"
-      },
-      "lsp": {
-        "background": "#eaeaea",
-        "foreground": "#0a0a0a",
-        "info": "#7fcbfd",
-        "warning": "#fbac7c",
-        "error": "#ea1f40"
-      }
-    },
-    "forms": {
-      "inputBackground": "#eaeaea",
-      "inputForeground": "#0a0a0a",
-      "inputBorder": "#b9b9b9",
-      "inputBorderHover": "#ababab",
-      "inputBorderFocus": "#babafa",
-      "inputPlaceholder": "#232323",
-      "inputDisabled": "#e3e3e3",
-      "inputSelection": "#0a0a0a16",
-      "label": "#232323",
-      "helperText": "#232323"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#6209fd",
-        "fg": "#ffffff",
-        "border": "#6209fd",
-        "hover": "#5806e6",
-        "active": "#babafa",
-        "disabled": "#e3e3e3"
-      },
-      "secondary": {
-        "bg": "#eaeaea",
-        "fg": "#0a0a0a",
-        "border": "#b9b9b9",
-        "hover": "#0a0a0a0e",
-        "active": "#0a0a0a16",
-        "disabled": "#e3e3e3"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#0a0a0a",
-        "border": "#00000000",
-        "hover": "#0a0a0a0e",
-        "active": "#0a0a0a16",
-        "disabled": "#232323"
-      },
-      "destructive": {
-        "bg": "#ea1f40",
-        "fg": "#000000",
-        "border": "#fea6a4",
-        "hover": "#fee2e1",
-        "active": "#ea1f40",
-        "disabled": "#e3e3e3"
-      }
-    },
-    "modal": {
-      "background": "#eaeaea",
-      "foreground": "#0a0a0a",
-      "border": "#b9b9b9",
-      "overlay": "#f1f1f13d"
-    },
-    "popover": {
-      "background": "#eaeaea",
-      "foreground": "#0a0a0a",
-      "border": "#b9b9b9",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#eaeaea",
-      "foreground": "#0a0a0a",
-      "border": "#b9b9b9",
-      "inputBackground": "#eaeaea",
-      "selectedBackground": "#0a0a0a16",
-      "selectedForeground": "#0a0a0a",
-      "muted": "#232323"
-    },
-    "fileAttachment": {
-      "background": "#e3e3e3",
-      "foreground": "#0a0a0a",
-      "border": "#b9b9b9",
-      "icon": "#232323",
-      "removeHover": "#fee2e1"
-    },
-    "sessions": {
-      "background": "#f1f1f1",
-      "foreground": "#0a0a0a",
-      "mutedForeground": "#232323",
-      "border": "#b9b9b9",
-      "hover": "#0a0a0a0e",
-      "active": "#0a0a0a16"
-    },
-    "modelSelector": {
-      "background": "#eaeaea",
-      "foreground": "#0a0a0a",
-      "border": "#b9b9b9",
-      "selectedBackground": "#0a0a0a16",
-      "selectedForeground": "#0a0a0a"
-    },
-    "permissions": {
-      "background": "#eaeaea",
-      "foreground": "#0a0a0a",
-      "border": "#b9b9b9",
-      "allow": "#20e679",
-      "allowBackground": "#b4ffc7",
-      "deny": "#ea1f40",
-      "denyBackground": "#fee2e1"
-    },
-    "loading": {
-      "spinner": "#6209fd",
-      "spinnerTrack": "#e3e3e3",
-      "skeleton": "#e3e3e3",
-      "shimmer": "#0a0a0a0e"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#0a0a0a26",
-      "thumbHover": "#0a0a0a40"
-    },
-    "badges": {
-      "default": {
-        "bg": "#e3e3e3",
-        "fg": "#0a0a0a",
-        "border": "#b9b9b9"
-      },
-      "info": {
-        "bg": "#d8edfd",
-        "fg": "#7fcbfd",
-        "border": "#7fcbfd"
-      },
-      "success": {
-        "bg": "#b4ffc7",
-        "fg": "#20e679",
-        "border": "#20e679"
-      },
-      "warning": {
-        "bg": "#ffe6c6",
-        "fg": "#fbac7c",
-        "border": "#fab141"
-      },
-      "error": {
-        "bg": "#fee2e1",
-        "fg": "#ea1f40",
-        "border": "#fea6a4"
-      }
-    },
-    "toast": {
-      "background": "#eaeaea",
-      "foreground": "#0a0a0a",
-      "border": "#b9b9b9",
-      "success": {
-        "background": "#b4ffc7",
-        "foreground": "#20e679",
-        "border": "#20e679"
-      },
-      "warning": {
-        "background": "#ffe6c6",
-        "foreground": "#fbac7c",
-        "border": "#fab141"
-      },
-      "error": {
-        "background": "#fee2e1",
-        "foreground": "#ea1f40",
-        "border": "#fea6a4"
-      },
-      "info": {
-        "background": "#d8edfd",
-        "foreground": "#7fcbfd",
-        "border": "#7fcbfd"
-      }
-    },
-    "emptyState": {
-      "icon": "#232323",
-      "title": "#0a0a0a",
-      "description": "#232323",
-      "border": "#b9b9b9"
-    },
-    "table": {
-      "border": "#b9b9b9",
-      "headerBackground": "#eaeaea",
-      "headerForeground": "#0a0a0a",
-      "rowHover": "#0a0a0a0e",
-      "rowSelected": "#0a0a0a16"
-    },
-    "charts": {
-      "series": [
-        "#6209fd",
-        "#7fcbfd",
-        "#20e679",
-        "#fbac7c",
-        "#ea1f40"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#babafa",
-      "selection": "#0a0a0a16",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #babafa40"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/aura-dark.json b/packages/ui/src/lib/theme/themes/aura-dark.json
index 2a311cfc..d2e670e1 100644
--- a/packages/ui/src/lib/theme/themes/aura-dark.json
+++ b/packages/ui/src/lib/theme/themes/aura-dark.json
@@ -30,7 +30,7 @@
       "subtle": "#25232f"
     },
     "interactive": {
-      "border": "#2D2B38",
+      "border": "#2a2935",
       "borderHover": "#47415a",
       "borderFocus": "#4E496C",
       "selection": "#95abe02d",
diff --git a/packages/ui/src/lib/theme/themes/ayu-dark.json b/packages/ui/src/lib/theme/themes/ayu-dark.json
index 3b7c9e62..c8562a31 100644
--- a/packages/ui/src/lib/theme/themes/ayu-dark.json
+++ b/packages/ui/src/lib/theme/themes/ayu-dark.json
@@ -30,7 +30,7 @@
       "subtle": "#1e252d"
     },
     "interactive": {
-      "border": "#2B3440",
+      "border": "#292c30",
       "borderHover": "#323C49",
       "borderFocus": "#56647C",
       "selection": "#c7c7df1d",
diff --git a/packages/ui/src/lib/theme/themes/ayu-light.json b/packages/ui/src/lib/theme/themes/ayu-light.json
index fcdbf7ec..4b6f58aa 100644
--- a/packages/ui/src/lib/theme/themes/ayu-light.json
+++ b/packages/ui/src/lib/theme/themes/ayu-light.json
@@ -30,7 +30,7 @@
       "subtle": "#FFF7E5"
     },
     "interactive": {
-      "border": "#E6DDCF",
+      "border": "#ece5d9",
       "borderHover": "#DCD3C5",
       "borderFocus": "#B09F8F",
       "selection": "#9fb2c43e",
diff --git a/packages/ui/src/lib/theme/themes/carbonfox-dark.json b/packages/ui/src/lib/theme/themes/carbonfox-dark.json
index 3eb08847..ee1e0ce2 100644
--- a/packages/ui/src/lib/theme/themes/carbonfox-dark.json
+++ b/packages/ui/src/lib/theme/themes/carbonfox-dark.json
@@ -30,7 +30,7 @@
       "subtle": "#292828"
     },
     "interactive": {
-      "border": "#393939",
+      "border": "#2d2c2c",
       "borderHover": "#4C4C4C",
       "borderFocus": "#4589FF",
       "selection": "#ffffff20",
diff --git a/packages/ui/src/lib/theme/themes/carbonfox-light.json b/packages/ui/src/lib/theme/themes/carbonfox-light.json
index 78f5c2bb..4ec2efa1 100644
--- a/packages/ui/src/lib/theme/themes/carbonfox-light.json
+++ b/packages/ui/src/lib/theme/themes/carbonfox-light.json
@@ -27,10 +27,10 @@
       "elevated": "#f4f4f7",
       "elevatedForeground": "#161616",
       "overlay": "#00000020",
-      "subtle": "#f2f2f8"
+      "subtle": "#f6f6f8"
     },
     "interactive": {
-      "border": "#DCDCDC",
+      "border": "#e3e2e2",
       "borderHover": "#D0D0D0",
       "borderFocus": "#0F62FE",
       "selection": "#cacfd87f",
diff --git a/packages/ui/src/lib/theme/themes/catppuccin-dark.json b/packages/ui/src/lib/theme/themes/catppuccin-dark.json
index 74699dec..d5105f26 100644
--- a/packages/ui/src/lib/theme/themes/catppuccin-dark.json
+++ b/packages/ui/src/lib/theme/themes/catppuccin-dark.json
@@ -27,7 +27,7 @@
       "elevated": "#282841",
       "elevatedForeground": "#CDD6F4",
       "overlay": "#F4F2FF20",
-      "subtle": "#2f2f50"
+      "subtle": "#26263f"
     },
     "interactive": {
       "border": "#35324A",
diff --git a/packages/ui/src/lib/theme/themes/catppuccin-light.json b/packages/ui/src/lib/theme/themes/catppuccin-light.json
index d2347581..9b86896e 100644
--- a/packages/ui/src/lib/theme/themes/catppuccin-light.json
+++ b/packages/ui/src/lib/theme/themes/catppuccin-light.json
@@ -22,15 +22,15 @@
     "surface": {
       "background": "#fff6f4",
       "foreground": "#2e314a",
-      "muted": "#f8ebe9",
+      "muted": "#f8edeb",
       "mutedForeground": "#888992",
       "elevated": "#fbefea",
       "elevatedForeground": "#4C4F69",
       "overlay": "#1F1F2A20",
-      "subtle": "#FDEEEE"
+      "subtle": "#fdeeee"
     },
     "interactive": {
-      "border": "#E0CFD3",
+      "border": "#e4d9dc",
       "borderHover": "#D6C4C8",
       "borderFocus": "#AB97A1",
       "selection": "#ffffff",
diff --git a/packages/ui/src/lib/theme/themes/cursor-dark.json b/packages/ui/src/lib/theme/themes/cursor-dark.json
deleted file mode 100644
index 5243be74..00000000
--- a/packages/ui/src/lib/theme/themes/cursor-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "cursor-dark",
-    "name": "Cursor",
-    "description": "Ported from OpenCode Cursor theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "cursor"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#88c0d0",
-      "hover": "#41aac5",
-      "active": "#1aaaa6",
-      "foreground": "#000000",
-      "muted": "#88c0d080",
-      "emphasis": "#54eee9"
-    },
-    "surface": {
-      "background": "#0e0e0e",
-      "foreground": "#e4e4e4",
-      "muted": "#1c1c1c",
-      "mutedForeground": "#e4e4e45e",
-      "elevated": "#161616",
-      "elevatedForeground": "#e4e4e4",
-      "overlay": "#0e0e0ecc",
-      "subtle": "#232323"
-    },
-    "interactive": {
-      "border": "#464646",
-      "borderHover": "#4f4f4f",
-      "borderFocus": "#1aaaa6",
-      "selection": "#e4e4e41f",
-      "selectionForeground": "#e4e4e4",
-      "focus": "#1aaaa6",
-      "focusRing": "#1aaaa661",
-      "cursor": "#fcfcfc",
-      "hover": "#e4e4e417",
-      "active": "#e4e4e41f"
-    },
-    "status": {
-      "error": "#e34671",
-      "errorForeground": "#151313",
-      "errorBackground": "#5a0523",
-      "errorBorder": "#7a0e33",
-      "warning": "#f1b467",
-      "warningForeground": "#151313",
-      "warningBackground": "#422902",
-      "warningBorder": "#5b3a07",
-      "success": "#3fa266",
-      "successForeground": "#151313",
-      "successBackground": "#00391c",
-      "successBorder": "#045029",
-      "info": "#81a1c1",
-      "infoForeground": "#151313",
-      "infoBackground": "#093152",
-      "infoBorder": "#1a446a"
-    },
-    "pr": {
-      "open": "#3fa266",
-      "draft": "#e4e4e45e",
-      "blocked": "#f1b467",
-      "merged": "#F8C762",
-      "closed": "#e34671"
-    },
-    "syntax": {
-      "base": {
-        "background": "#161616",
-        "foreground": "#e4e4e4",
-        "comment": "#e4e4e45e",
-        "keyword": "#82D2CE",
-        "string": "#E394DC",
-        "number": "#F8C762",
-        "function": "#81a1c1",
-        "variable": "#e4e4e4",
-        "type": "#EFB080",
-        "operator": "#e4e4e4"
-      },
-      "tokens": {
-        "commentDoc": "#e4e4e45e",
-        "stringEscape": "#e4e4e4",
-        "keywordImport": "#82D2CE",
-        "storageModifier": "#82D2CE",
-        "functionCall": "#81a1c1",
-        "method": "#81a1c1",
-        "variableProperty": "#81a1c1",
-        "variableOther": "#e4e4e4",
-        "variableGlobal": "#F8C762",
-        "variableLocal": "#e4e4e4",
-        "parameter": "#e4e4e4",
-        "constant": "#F8C762",
-        "class": "#EFB080",
-        "className": "#EFB080",
-        "interface": "#EFB080",
-        "struct": "#EFB080",
-        "enum": "#EFB080",
-        "typeParameter": "#EFB080",
-        "namespace": "#EFB080",
-        "module": "#82D2CE",
-        "tag": "#82D2CE",
-        "jsxTag": "#82D2CE",
-        "tagAttribute": "#81a1c1",
-        "tagAttributeValue": "#E394DC",
-        "boolean": "#F8C762",
-        "decorator": "#82D2CE",
-        "label": "#81a1c1",
-        "punctuation": "#e4e4e4",
-        "macro": "#82D2CE",
-        "preprocessor": "#82D2CE",
-        "regex": "#e4e4e4",
-        "url": "#54eee9",
-        "key": "#81a1c1",
-        "exception": "#e34671"
-      },
-      "highlights": {
-        "diffAdded": "#75f1a8",
-        "diffAddedBackground": "#021c0d",
-        "diffRemoved": "#fcc3c8",
-        "diffRemovedBackground": "#31010c",
-        "diffModified": "#fdd8ac",
-        "diffModifiedBackground": "#1a1d1d",
-        "lineNumber": "#bdbdbd",
-        "lineNumberActive": "#e4e4e4"
-      }
-    },
-    "header": {
-      "background": "#0e0e0e",
-      "foreground": "#e4e4e4",
-      "border": "#464646",
-      "icon": "#909090",
-      "hover": "#232323"
-    },
-    "sidebar": {
-      "background": "#141414",
-      "foreground": "#e4e4e45e",
-      "border": "#464646",
-      "icon": "#272727",
-      "hover": "#232323",
-      "active": "#003735",
-      "accent": "#88c0d0",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#0e0e0e",
-      "userMessage": "#e4e4e4",
-      "userMessageBackground": "#1c1c1c",
-      "assistantMessage": "#e4e4e4",
-      "assistantMessageBackground": "#0e0e0e",
-      "timestamp": "#bdbdbd",
-      "divider": "#353535",
-      "typing": "#e4e4e45e"
-    },
-    "markdown": {
-      "heading1": "#AAA0FA",
-      "heading2": "#AAA0FA",
-      "heading3": "#fcfcfc",
-      "heading4": "#e4e4e4",
-      "link": "#82D2CE",
-      "linkHover": "#81a1c1",
-      "inlineCode": "#E394DC",
-      "inlineCodeBackground": "#1c1c1c",
-      "blockquote": "#e4e4e45e",
-      "blockquoteBorder": "#464646",
-      "listMarker": "#e4e4e499",
-      "bold": "#F8C762",
-      "italic": "#82D2CE",
-      "strikethrough": "#e4e4e45e",
-      "hr": "#e4e4e45e"
-    },
-    "tools": {
-      "background": "#1c1c1c",
-      "border": "#353535",
-      "headerHover": "#232323",
-      "icon": "#272727",
-      "title": "#e4e4e4",
-      "description": "#e4e4e45e",
-      "edit": {
-        "added": "#75f1a8",
-        "addedBackground": "#021c0d",
-        "removed": "#f72661",
-        "removedBackground": "#31010c",
-        "modified": "#fdd8ac",
-        "modifiedBackground": "#1a1d1d",
-        "lineNumber": "#bdbdbd"
-      },
-      "bash": {
-        "background": "#161616",
-        "foreground": "#e4e4e4",
-        "info": "#81a1c1",
-        "warning": "#f1b467",
-        "error": "#e34671"
-      },
-      "lsp": {
-        "background": "#161616",
-        "foreground": "#e4e4e4",
-        "info": "#81a1c1",
-        "warning": "#f1b467",
-        "error": "#e34671"
-      }
-    },
-    "forms": {
-      "inputBackground": "#111111",
-      "inputForeground": "#e4e4e4",
-      "inputBorder": "#353535",
-      "inputBorderHover": "#3e3e3e",
-      "inputBorderFocus": "#1aaaa6",
-      "inputPlaceholder": "#bdbdbd",
-      "inputDisabled": "#191919",
-      "inputSelection": "#0e6865",
-      "label": "#e4e4e45e",
-      "helperText": "#bdbdbd"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#88c0d0",
-        "fg": "#000000",
-        "border": "#044c4a",
-        "hover": "#41aac5",
-        "active": "#1aaaa6",
-        "disabled": "#3e3e3e"
-      },
-      "secondary": {
-        "bg": "#161616",
-        "fg": "#e4e4e4",
-        "border": "#464646",
-        "hover": "#1c1c1c",
-        "active": "#232323",
-        "disabled": "#191919"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#e4e4e4",
-        "border": "#00000000",
-        "hover": "#1c1c1c",
-        "active": "#232323",
-        "disabled": "#bdbdbd"
-      },
-      "destructive": {
-        "bg": "#e34671",
-        "fg": "#151313",
-        "border": "#7a0e33",
-        "hover": "#7a0e33",
-        "active": "#c21a55",
-        "disabled": "#191919"
-      }
-    },
-    "modal": {
-      "background": "#161616",
-      "foreground": "#e4e4e4",
-      "border": "#464646",
-      "overlay": "#0e0e0ed6"
-    },
-    "popover": {
-      "background": "#161616",
-      "foreground": "#e4e4e4",
-      "border": "#464646",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#161616",
-      "foreground": "#e4e4e4",
-      "border": "#464646",
-      "inputBackground": "#111111",
-      "selectedBackground": "#003735",
-      "selectedForeground": "#e4e4e4",
-      "muted": "#e4e4e45e"
-    },
-    "fileAttachment": {
-      "background": "#1c1c1c",
-      "foreground": "#e4e4e4",
-      "border": "#353535",
-      "icon": "#272727",
-      "removeHover": "#5a0523"
-    },
-    "sessions": {
-      "background": "#0e0e0e",
-      "foreground": "#e4e4e4",
-      "mutedForeground": "#e4e4e45e",
-      "border": "#2d2d2d",
-      "hover": "#232323",
-      "active": "#003735"
-    },
-    "modelSelector": {
-      "background": "#161616",
-      "foreground": "#e4e4e4",
-      "border": "#464646",
-      "selectedBackground": "#003735",
-      "selectedForeground": "#e4e4e4"
-    },
-    "permissions": {
-      "background": "#161616",
-      "foreground": "#e4e4e4",
-      "border": "#464646",
-      "allow": "#3fa266",
-      "allowBackground": "#00391c",
-      "deny": "#e34671",
-      "denyBackground": "#5a0523"
-    },
-    "loading": {
-      "spinner": "#88c0d0",
-      "spinnerTrack": "#232323",
-      "skeleton": "#1c1c1c",
-      "shimmer": "#232323"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#e4e4e433",
-      "thumbHover": "#e4e4e457"
-    },
-    "badges": {
-      "default": {
-        "bg": "#1c1c1c",
-        "fg": "#e4e4e4",
-        "border": "#353535"
-      },
-      "info": {
-        "bg": "#093152",
-        "fg": "#81a1c1",
-        "border": "#1a446a"
-      },
-      "success": {
-        "bg": "#00391c",
-        "fg": "#3fa266",
-        "border": "#045029"
-      },
-      "warning": {
-        "bg": "#422902",
-        "fg": "#f1b467",
-        "border": "#5b3a07"
-      },
-      "error": {
-        "bg": "#5a0523",
-        "fg": "#e34671",
-        "border": "#7a0e33"
-      }
-    },
-    "toast": {
-      "background": "#161616",
-      "foreground": "#e4e4e4",
-      "border": "#464646",
-      "success": {
-        "background": "#00391c",
-        "foreground": "#3fa266",
-        "border": "#045029"
-      },
-      "warning": {
-        "background": "#422902",
-        "foreground": "#f1b467",
-        "border": "#5b3a07"
-      },
-      "error": {
-        "background": "#5a0523",
-        "foreground": "#e34671",
-        "border": "#7a0e33"
-      },
-      "info": {
-        "background": "#093152",
-        "foreground": "#81a1c1",
-        "border": "#1a446a"
-      }
-    },
-    "emptyState": {
-      "icon": "#e4e4e45e",
-      "title": "#e4e4e4",
-      "description": "#e4e4e45e",
-      "border": "#2d2d2d"
-    },
-    "table": {
-      "border": "#2d2d2d",
-      "headerBackground": "#161616",
-      "headerForeground": "#e4e4e4",
-      "rowHover": "#232323",
-      "rowSelected": "#003735"
-    },
-    "charts": {
-      "series": [
-        "#88c0d0",
-        "#81a1c1",
-        "#3fa266",
-        "#f1b467",
-        "#e34671"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#1aaaa6",
-      "selection": "#003735",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #82D2CE59"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/cursor-light.json b/packages/ui/src/lib/theme/themes/cursor-light.json
deleted file mode 100644
index 9729bc05..00000000
--- a/packages/ui/src/lib/theme/themes/cursor-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "cursor-light",
-    "name": "Cursor",
-    "description": "Ported from OpenCode Cursor theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "cursor"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#6f9ba6",
-      "hover": "#5992a0",
-      "active": "#12659a",
-      "foreground": "#000000",
-      "muted": "#6f9ba680",
-      "emphasis": "#0e5b8b"
-    },
-    "surface": {
-      "background": "#fcfcfc",
-      "foreground": "#131313",
-      "muted": "#eeeeee",
-      "mutedForeground": "#141414ad",
-      "elevated": "#f5f5f5",
-      "elevatedForeground": "#131313",
-      "overlay": "#fcfcfc33",
-      "subtle": "#e5e5e5"
-    },
-    "interactive": {
-      "border": "#c3c3c3",
-      "borderHover": "#b5b5b5",
-      "borderFocus": "#12659a",
-      "selection": "#13131316",
-      "selectionForeground": "#131313",
-      "focus": "#12659a",
-      "focusRing": "#12659a47",
-      "cursor": "#050505",
-      "hover": "#1313130e",
-      "active": "#13131316"
-    },
-    "status": {
-      "error": "#cf2d56",
-      "errorForeground": "#ffffff",
-      "errorBackground": "#fee2e4",
-      "errorBorder": "#fba6af",
-      "warning": "#db704b",
-      "warningForeground": "#000000",
-      "warningBackground": "#fde4db",
-      "warningBorder": "#faab90",
-      "success": "#1f8a65",
-      "successForeground": "#000000",
-      "successBackground": "#bbfadd",
-      "successBorder": "#6fdaad",
-      "info": "#3c7cab",
-      "infoForeground": "#000000",
-      "infoBackground": "#d8edfe",
-      "infoBorder": "#8ac9fa"
-    },
-    "pr": {
-      "open": "#1f8a65",
-      "draft": "#141414ad",
-      "blocked": "#db704b",
-      "merged": "#b8448b",
-      "closed": "#cf2d56"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f5f5f5",
-        "foreground": "#131313",
-        "comment": "#141414ad",
-        "keyword": "#b3003f",
-        "string": "#9e94d5",
-        "number": "#b8448b",
-        "function": "#141414ad",
-        "variable": "#141414",
-        "type": "#206595",
-        "operator": "#141414"
-      },
-      "tokens": {
-        "commentDoc": "#141414ad",
-        "stringEscape": "#131313",
-        "keywordImport": "#b3003f",
-        "storageModifier": "#b3003f",
-        "functionCall": "#141414ad",
-        "method": "#141414ad",
-        "variableProperty": "#141414ad",
-        "variableOther": "#141414",
-        "variableGlobal": "#b8448b",
-        "variableLocal": "#141414",
-        "parameter": "#141414",
-        "constant": "#b8448b",
-        "class": "#206595",
-        "className": "#206595",
-        "interface": "#206595",
-        "struct": "#206595",
-        "enum": "#206595",
-        "typeParameter": "#206595",
-        "namespace": "#206595",
-        "module": "#b3003f",
-        "tag": "#b3003f",
-        "jsxTag": "#b3003f",
-        "tagAttribute": "#141414ad",
-        "tagAttributeValue": "#9e94d5",
-        "boolean": "#b8448b",
-        "decorator": "#b3003f",
-        "label": "#141414ad",
-        "punctuation": "#141414",
-        "macro": "#b3003f",
-        "preprocessor": "#b3003f",
-        "regex": "#131313",
-        "url": "#0e5b8b",
-        "key": "#141414ad",
-        "exception": "#cf2d56"
-      },
-      "highlights": {
-        "diffAdded": "#0c7251",
-        "diffAddedBackground": "#ecfff5",
-        "diffRemoved": "#ae1945",
-        "diffRemovedBackground": "#fef7f8",
-        "diffModified": "#FF8C00",
-        "diffModifiedBackground": "#f0f2f3",
-        "lineNumber": "#313131",
-        "lineNumberActive": "#131313"
-      }
-    },
-    "header": {
-      "background": "#fcfcfc",
-      "foreground": "#131313",
-      "border": "#c3c3c3",
-      "icon": "#2d2d2d",
-      "hover": "#e5e5e5"
-    },
-    "sidebar": {
-      "background": "#f1f1f1",
-      "foreground": "#141414ad",
-      "border": "#c3c3c3",
-      "icon": "#c5c5c5",
-      "hover": "#e5e5e5",
-      "active": "#daedfd",
-      "accent": "#6f9ba6",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#fcfcfc",
-      "userMessage": "#131313",
-      "userMessageBackground": "#eeeeee",
-      "assistantMessage": "#131313",
-      "assistantMessageBackground": "#fcfcfc",
-      "timestamp": "#313131",
-      "divider": "#dfdfdf",
-      "typing": "#141414ad"
-    },
-    "markdown": {
-      "heading1": "#206595",
-      "heading2": "#206595",
-      "heading3": "#050505",
-      "heading4": "#131313",
-      "link": "#206595",
-      "linkHover": "#141414ad",
-      "inlineCode": "#1f8a65",
-      "inlineCodeBackground": "#eeeeee",
-      "blockquote": "#141414ad",
-      "blockquoteBorder": "#c3c3c3",
-      "listMarker": "#14141499",
-      "bold": "#141414",
-      "italic": "#141414",
-      "strikethrough": "#141414ad",
-      "hr": "#141414ad"
-    },
-    "tools": {
-      "background": "#eeeeee",
-      "border": "#dfdfdf",
-      "headerHover": "#e5e5e5",
-      "icon": "#c5c5c5",
-      "title": "#131313",
-      "description": "#141414ad",
-      "edit": {
-        "added": "#0c7251",
-        "addedBackground": "#ecfff5",
-        "removed": "#ec3766",
-        "removedBackground": "#fef7f8",
-        "modified": "#FF8C00",
-        "modifiedBackground": "#f0f2f3",
-        "lineNumber": "#313131"
-      },
-      "bash": {
-        "background": "#f5f5f5",
-        "foreground": "#131313",
-        "info": "#3c7cab",
-        "warning": "#db704b",
-        "error": "#cf2d56"
-      },
-      "lsp": {
-        "background": "#f5f5f5",
-        "foreground": "#131313",
-        "info": "#3c7cab",
-        "warning": "#db704b",
-        "error": "#cf2d56"
-      }
-    },
-    "forms": {
-      "inputBackground": "#fcfcfc",
-      "inputForeground": "#131313",
-      "inputBorder": "#dfdfdf",
-      "inputBorderHover": "#d1d1d1",
-      "inputBorderFocus": "#12659a",
-      "inputPlaceholder": "#313131",
-      "inputDisabled": "#eaeaea",
-      "inputSelection": "#daedfd",
-      "label": "#141414ad",
-      "helperText": "#313131"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#6f9ba6",
-        "fg": "#000000",
-        "border": "#88c9fd",
-        "hover": "#5992a0",
-        "active": "#12659a",
-        "disabled": "#cdcdcd"
-      },
-      "secondary": {
-        "bg": "#f5f5f5",
-        "fg": "#131313",
-        "border": "#c3c3c3",
-        "hover": "#eeeeee",
-        "active": "#e5e5e5",
-        "disabled": "#eaeaea"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#131313",
-        "border": "#00000000",
-        "hover": "#eeeeee",
-        "active": "#e5e5e5",
-        "disabled": "#313131"
-      },
-      "destructive": {
-        "bg": "#cf2d56",
-        "fg": "#ffffff",
-        "border": "#fba6af",
-        "hover": "#fdd4d8",
-        "active": "#d61853",
-        "disabled": "#eaeaea"
-      }
-    },
-    "modal": {
-      "background": "#f5f5f5",
-      "foreground": "#131313",
-      "border": "#c3c3c3",
-      "overlay": "#fcfcfc3d"
-    },
-    "popover": {
-      "background": "#f5f5f5",
-      "foreground": "#131313",
-      "border": "#c3c3c3",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f5f5f5",
-      "foreground": "#131313",
-      "border": "#c3c3c3",
-      "inputBackground": "#fcfcfc",
-      "selectedBackground": "#daedfd",
-      "selectedForeground": "#131313",
-      "muted": "#141414ad"
-    },
-    "fileAttachment": {
-      "background": "#eeeeee",
-      "foreground": "#131313",
-      "border": "#dfdfdf",
-      "icon": "#c5c5c5",
-      "removeHover": "#fee2e4"
-    },
-    "sessions": {
-      "background": "#fcfcfc",
-      "foreground": "#131313",
-      "mutedForeground": "#141414ad",
-      "border": "#e9e9e9",
-      "hover": "#e5e5e5",
-      "active": "#daedfd"
-    },
-    "modelSelector": {
-      "background": "#f5f5f5",
-      "foreground": "#131313",
-      "border": "#c3c3c3",
-      "selectedBackground": "#daedfd",
-      "selectedForeground": "#131313"
-    },
-    "permissions": {
-      "background": "#f5f5f5",
-      "foreground": "#131313",
-      "border": "#c3c3c3",
-      "allow": "#1f8a65",
-      "allowBackground": "#bbfadd",
-      "deny": "#cf2d56",
-      "denyBackground": "#fee2e4"
-    },
-    "loading": {
-      "spinner": "#6f9ba6",
-      "spinnerTrack": "#e5e5e5",
-      "skeleton": "#eeeeee",
-      "shimmer": "#e5e5e5"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#13131326",
-      "thumbHover": "#13131340"
-    },
-    "badges": {
-      "default": {
-        "bg": "#eeeeee",
-        "fg": "#131313",
-        "border": "#dfdfdf"
-      },
-      "info": {
-        "bg": "#d8edfe",
-        "fg": "#3c7cab",
-        "border": "#8ac9fa"
-      },
-      "success": {
-        "bg": "#bbfadd",
-        "fg": "#1f8a65",
-        "border": "#6fdaad"
-      },
-      "warning": {
-        "bg": "#fde4db",
-        "fg": "#db704b",
-        "border": "#faab90"
-      },
-      "error": {
-        "bg": "#fee2e4",
-        "fg": "#cf2d56",
-        "border": "#fba6af"
-      }
-    },
-    "toast": {
-      "background": "#f5f5f5",
-      "foreground": "#131313",
-      "border": "#c3c3c3",
-      "success": {
-        "background": "#bbfadd",
-        "foreground": "#1f8a65",
-        "border": "#6fdaad"
-      },
-      "warning": {
-        "background": "#fde4db",
-        "foreground": "#db704b",
-        "border": "#faab90"
-      },
-      "error": {
-        "background": "#fee2e4",
-        "foreground": "#cf2d56",
-        "border": "#fba6af"
-      },
-      "info": {
-        "background": "#d8edfe",
-        "foreground": "#3c7cab",
-        "border": "#8ac9fa"
-      }
-    },
-    "emptyState": {
-      "icon": "#141414ad",
-      "title": "#131313",
-      "description": "#141414ad",
-      "border": "#e9e9e9"
-    },
-    "table": {
-      "border": "#e9e9e9",
-      "headerBackground": "#f5f5f5",
-      "headerForeground": "#131313",
-      "rowHover": "#e5e5e5",
-      "rowSelected": "#daedfd"
-    },
-    "charts": {
-      "series": [
-        "#6f9ba6",
-        "#3c7cab",
-        "#1f8a65",
-        "#db704b",
-        "#cf2d56"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#12659a",
-      "selection": "#daedfd",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #20659540"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/dracula-dark.json b/packages/ui/src/lib/theme/themes/dracula-dark.json
index 1a936c20..dc49216c 100644
--- a/packages/ui/src/lib/theme/themes/dracula-dark.json
+++ b/packages/ui/src/lib/theme/themes/dracula-dark.json
@@ -27,10 +27,10 @@
       "elevated": "#161722",
       "elevatedForeground": "#F8F8F2",
       "overlay": "#FFFFFF20",
-      "subtle": "#222436"
+      "subtle": "#1f2030"
     },
     "interactive": {
-      "border": "#2D2F3C",
+      "border": "#292a36",
       "borderHover": "#303244",
       "borderFocus": "#4A4D6D",
       "selection": "#30334b",
diff --git a/packages/ui/src/lib/theme/themes/fields-of-the-shire-dark.json b/packages/ui/src/lib/theme/themes/fields-of-the-shire-dark.json
index e3d8bfb6..80991010 100644
--- a/packages/ui/src/lib/theme/themes/fields-of-the-shire-dark.json
+++ b/packages/ui/src/lib/theme/themes/fields-of-the-shire-dark.json
@@ -1,6 +1,6 @@
 {
   "metadata": {
-    "id": "openchamber-dark",
+    "id": "fields-of-the-shire-dark",
     "name": "Fields of the Shire",
     "description": "Fields of the Shire theme - dark variant",
     "author": "OpenChamber",
@@ -30,10 +30,10 @@
       "elevated": "#2b2622",
       "elevatedForeground": "#ebe0d1",
       "overlay": "#1b1815cc",
-      "subtle": "#332d28"
+      "subtle": "#282320"
     },
     "interactive": {
-      "border": "#413e3a",
+      "border": "#35322f",
       "borderHover": "#f0e6d830",
       "borderFocus": "#373d2c",
       "selection": "#f0e6d81f",
diff --git a/packages/ui/src/lib/theme/themes/fields-of-the-shire-light.json b/packages/ui/src/lib/theme/themes/fields-of-the-shire-light.json
index e3dbf3f8..b9b89490 100644
--- a/packages/ui/src/lib/theme/themes/fields-of-the-shire-light.json
+++ b/packages/ui/src/lib/theme/themes/fields-of-the-shire-light.json
@@ -1,6 +1,6 @@
 {
   "metadata": {
-    "id": "openchamber-light",
+    "id": "fields-of-the-shire-light",
     "name": "Fields of the Shire",
     "description": "Fields of the Shire theme - light variant",
     "author": "OpenChamber",
@@ -30,7 +30,7 @@
       "elevated": "#fcf9f0",
       "elevatedForeground": "#1a1612",
       "overlay": "#1a161220",
-      "subtle": "#efe8da"
+      "subtle": "#f1ece1"
     },
     "interactive": {
       "border": "#1a16121c",
diff --git a/packages/ui/src/lib/theme/themes/flexoki-dark.json b/packages/ui/src/lib/theme/themes/flexoki-dark.json
index 65ccfe92..48d31f34 100644
--- a/packages/ui/src/lib/theme/themes/flexoki-dark.json
+++ b/packages/ui/src/lib/theme/themes/flexoki-dark.json
@@ -32,7 +32,7 @@
       "subtle": "#1e1d1c"
     },
     "interactive": {
-      "border": "#343331",
+      "border": "#2b2a28",
       "borderHover": "#403E3C",
       "borderFocus": "#DA702C",
       "selection": "#f4f4f41f",
diff --git a/packages/ui/src/lib/theme/themes/flexoki-light.json b/packages/ui/src/lib/theme/themes/flexoki-light.json
index 5880bf74..f1157f8f 100644
--- a/packages/ui/src/lib/theme/themes/flexoki-light.json
+++ b/packages/ui/src/lib/theme/themes/flexoki-light.json
@@ -32,7 +32,7 @@
       "subtle": "#f7f4ec"
     },
     "interactive": {
-      "border": "#DAD8CE",
+      "border": "#e6e4db",
       "borderHover": "#CECDC3",
       "borderFocus": "#BC5215",
       "selection": "#76736f30",
diff --git a/packages/ui/src/lib/theme/themes/github-dark.json b/packages/ui/src/lib/theme/themes/github-dark.json
deleted file mode 100644
index 08418975..00000000
--- a/packages/ui/src/lib/theme/themes/github-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "github-dark",
-    "name": "GitHub",
-    "description": "Ported from OpenCode GitHub theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "github"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#58a6ff",
-      "hover": "#238cf5",
-      "active": "#197de0",
-      "foreground": "#000000",
-      "muted": "#58a6ff80",
-      "emphasis": "#b7d7fd"
-    },
-    "surface": {
-      "background": "#05080e",
-      "foreground": "#ccd4dc",
-      "muted": "#12151b",
-      "mutedForeground": "#8b949e",
-      "elevated": "#0c0f16",
-      "elevatedForeground": "#ccd4dc",
-      "overlay": "#05080ecc",
-      "subtle": "#181c22"
-    },
-    "interactive": {
-      "border": "#393d44",
-      "borderHover": "#41454c",
-      "borderFocus": "#197de0",
-      "selection": "#ccd4dc1f",
-      "selectionForeground": "#ccd4dc",
-      "focus": "#197de0",
-      "focusRing": "#197de061",
-      "cursor": "#fafbfc",
-      "hover": "#ccd4dc17",
-      "active": "#ccd4dc1f"
-    },
-    "status": {
-      "error": "#f85149",
-      "errorForeground": "#151313",
-      "errorBackground": "#5e0206",
-      "errorBorder": "#7e080d",
-      "warning": "#e3b341",
-      "warningForeground": "#151313",
-      "warningBackground": "#3c2c02",
-      "warningBorder": "#533e07",
-      "success": "#3fb950",
-      "successForeground": "#151313",
-      "successBackground": "#063a10",
-      "successBorder": "#0f501a",
-      "info": "#d29922",
-      "infoForeground": "#151313",
-      "infoBackground": "#3f2b02",
-      "infoBorder": "#563d07"
-    },
-    "pr": {
-      "open": "#3fb950",
-      "draft": "#8b949e",
-      "blocked": "#e3b341",
-      "merged": "#58a6ff",
-      "closed": "#f85149"
-    },
-    "syntax": {
-      "base": {
-        "background": "#0c0f16",
-        "foreground": "#ccd4dc",
-        "comment": "#8b949e",
-        "keyword": "#ff7b72",
-        "string": "#39c5cf",
-        "number": "#58a6ff",
-        "function": "#39c5cf",
-        "variable": "#d29922",
-        "type": "#d29922",
-        "operator": "#ff7b72"
-      },
-      "tokens": {
-        "commentDoc": "#8b949e",
-        "stringEscape": "#ccd4dc",
-        "keywordImport": "#ff7b72",
-        "storageModifier": "#ff7b72",
-        "functionCall": "#39c5cf",
-        "method": "#39c5cf",
-        "variableProperty": "#39c5cf",
-        "variableOther": "#d29922",
-        "variableGlobal": "#58a6ff",
-        "variableLocal": "#c9d1d9",
-        "parameter": "#d29922",
-        "constant": "#58a6ff",
-        "class": "#d29922",
-        "className": "#d29922",
-        "interface": "#d29922",
-        "struct": "#d29922",
-        "enum": "#d29922",
-        "typeParameter": "#d29922",
-        "namespace": "#d29922",
-        "module": "#ff7b72",
-        "tag": "#ff7b72",
-        "jsxTag": "#ff7b72",
-        "tagAttribute": "#39c5cf",
-        "tagAttributeValue": "#39c5cf",
-        "boolean": "#58a6ff",
-        "decorator": "#ff7b72",
-        "label": "#39c5cf",
-        "punctuation": "#c9d1d9",
-        "macro": "#ff7b72",
-        "preprocessor": "#ff7b72",
-        "regex": "#ccd4dc",
-        "url": "#b7d7fd",
-        "key": "#39c5cf",
-        "exception": "#f85149"
-      },
-      "highlights": {
-        "diffAdded": "#6af679",
-        "diffAddedBackground": "#001d03",
-        "diffRemoved": "#fec3bb",
-        "diffRemovedBackground": "#330001",
-        "diffModified": "#fdda8e",
-        "diffModifiedBackground": "#0f151e",
-        "lineNumber": "#6a7077",
-        "lineNumberActive": "#ccd4dc"
-      }
-    },
-    "header": {
-      "background": "#05080e",
-      "foreground": "#ccd4dc",
-      "border": "#393d44",
-      "icon": "#7b828a",
-      "hover": "#181c22"
-    },
-    "sidebar": {
-      "background": "#0a0e14",
-      "foreground": "#8b949e",
-      "border": "#393d44",
-      "icon": "#1a1f26",
-      "hover": "#181c22",
-      "active": "#032f5a",
-      "accent": "#58a6ff",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#05080e",
-      "userMessage": "#ccd4dc",
-      "userMessageBackground": "#12151b",
-      "assistantMessage": "#ccd4dc",
-      "assistantMessageBackground": "#05080e",
-      "timestamp": "#6a7077",
-      "divider": "#292d33",
-      "typing": "#8b949e"
-    },
-    "markdown": {
-      "heading1": "#58a6ff",
-      "heading2": "#58a6ff",
-      "heading3": "#fafbfc",
-      "heading4": "#ccd4dc",
-      "link": "#58a6ff",
-      "linkHover": "#39c5cf",
-      "inlineCode": "#ff7b72",
-      "inlineCodeBackground": "#12151b",
-      "blockquote": "#8b949e",
-      "blockquoteBorder": "#393d44",
-      "listMarker": "#58a6ff99",
-      "bold": "#d29922",
-      "italic": "#e3b341",
-      "strikethrough": "#8b949e",
-      "hr": "#30363d"
-    },
-    "tools": {
-      "background": "#12151b",
-      "border": "#292d33",
-      "headerHover": "#181c22",
-      "icon": "#1a1f26",
-      "title": "#ccd4dc",
-      "description": "#8b949e",
-      "edit": {
-        "added": "#6af679",
-        "addedBackground": "#001d03",
-        "removed": "#f5031c",
-        "removedBackground": "#330001",
-        "modified": "#fdda8e",
-        "modifiedBackground": "#0f151e",
-        "lineNumber": "#6a7077"
-      },
-      "bash": {
-        "background": "#0c0f16",
-        "foreground": "#ccd4dc",
-        "info": "#d29922",
-        "warning": "#e3b341",
-        "error": "#f85149"
-      },
-      "lsp": {
-        "background": "#0c0f16",
-        "foreground": "#ccd4dc",
-        "info": "#d29922",
-        "warning": "#e3b341",
-        "error": "#f85149"
-      }
-    },
-    "forms": {
-      "inputBackground": "#070b11",
-      "inputForeground": "#ccd4dc",
-      "inputBorder": "#292d33",
-      "inputBorderHover": "#31353b",
-      "inputBorderFocus": "#197de0",
-      "inputPlaceholder": "#6a7077",
-      "inputDisabled": "#0d1218",
-      "inputSelection": "#145ba2",
-      "label": "#8b949e",
-      "helperText": "#6a7077"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#58a6ff",
-        "fg": "#000000",
-        "border": "#09427a",
-        "hover": "#238cf5",
-        "active": "#197de0",
-        "disabled": "#31353b"
-      },
-      "secondary": {
-        "bg": "#0c0f16",
-        "fg": "#ccd4dc",
-        "border": "#393d44",
-        "hover": "#12151b",
-        "active": "#181c22",
-        "disabled": "#0d1218"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#ccd4dc",
-        "border": "#00000000",
-        "hover": "#12151b",
-        "active": "#181c22",
-        "disabled": "#6a7077"
-      },
-      "destructive": {
-        "bg": "#f85149",
-        "fg": "#151313",
-        "border": "#7e080d",
-        "hover": "#7e080d",
-        "active": "#d01d21",
-        "disabled": "#0d1218"
-      }
-    },
-    "modal": {
-      "background": "#0c0f16",
-      "foreground": "#ccd4dc",
-      "border": "#393d44",
-      "overlay": "#05080ed6"
-    },
-    "popover": {
-      "background": "#0c0f16",
-      "foreground": "#ccd4dc",
-      "border": "#393d44",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#0c0f16",
-      "foreground": "#ccd4dc",
-      "border": "#393d44",
-      "inputBackground": "#070b11",
-      "selectedBackground": "#032f5a",
-      "selectedForeground": "#ccd4dc",
-      "muted": "#8b949e"
-    },
-    "fileAttachment": {
-      "background": "#12151b",
-      "foreground": "#ccd4dc",
-      "border": "#292d33",
-      "icon": "#1a1f26",
-      "removeHover": "#5e0206"
-    },
-    "sessions": {
-      "background": "#05080e",
-      "foreground": "#ccd4dc",
-      "mutedForeground": "#8b949e",
-      "border": "#21252b",
-      "hover": "#181c22",
-      "active": "#032f5a"
-    },
-    "modelSelector": {
-      "background": "#0c0f16",
-      "foreground": "#ccd4dc",
-      "border": "#393d44",
-      "selectedBackground": "#032f5a",
-      "selectedForeground": "#ccd4dc"
-    },
-    "permissions": {
-      "background": "#0c0f16",
-      "foreground": "#ccd4dc",
-      "border": "#393d44",
-      "allow": "#3fb950",
-      "allowBackground": "#063a10",
-      "deny": "#f85149",
-      "denyBackground": "#5e0206"
-    },
-    "loading": {
-      "spinner": "#58a6ff",
-      "spinnerTrack": "#181c22",
-      "skeleton": "#12151b",
-      "shimmer": "#181c22"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#ccd4dc33",
-      "thumbHover": "#ccd4dc57"
-    },
-    "badges": {
-      "default": {
-        "bg": "#12151b",
-        "fg": "#ccd4dc",
-        "border": "#292d33"
-      },
-      "info": {
-        "bg": "#3f2b02",
-        "fg": "#d29922",
-        "border": "#563d07"
-      },
-      "success": {
-        "bg": "#063a10",
-        "fg": "#3fb950",
-        "border": "#0f501a"
-      },
-      "warning": {
-        "bg": "#3c2c02",
-        "fg": "#e3b341",
-        "border": "#533e07"
-      },
-      "error": {
-        "bg": "#5e0206",
-        "fg": "#f85149",
-        "border": "#7e080d"
-      }
-    },
-    "toast": {
-      "background": "#0c0f16",
-      "foreground": "#ccd4dc",
-      "border": "#393d44",
-      "success": {
-        "background": "#063a10",
-        "foreground": "#3fb950",
-        "border": "#0f501a"
-      },
-      "warning": {
-        "background": "#3c2c02",
-        "foreground": "#e3b341",
-        "border": "#533e07"
-      },
-      "error": {
-        "background": "#5e0206",
-        "foreground": "#f85149",
-        "border": "#7e080d"
-      },
-      "info": {
-        "background": "#3f2b02",
-        "foreground": "#d29922",
-        "border": "#563d07"
-      }
-    },
-    "emptyState": {
-      "icon": "#8b949e",
-      "title": "#ccd4dc",
-      "description": "#8b949e",
-      "border": "#21252b"
-    },
-    "table": {
-      "border": "#21252b",
-      "headerBackground": "#0c0f16",
-      "headerForeground": "#ccd4dc",
-      "rowHover": "#181c22",
-      "rowSelected": "#032f5a"
-    },
-    "charts": {
-      "series": [
-        "#58a6ff",
-        "#d29922",
-        "#3fb950",
-        "#e3b341",
-        "#f85149"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#197de0",
-      "selection": "#032f5a",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #58a6ff59"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/github-light.json b/packages/ui/src/lib/theme/themes/github-light.json
deleted file mode 100644
index 765704f3..00000000
--- a/packages/ui/src/lib/theme/themes/github-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "github-light",
-    "name": "GitHub",
-    "description": "Ported from OpenCode GitHub theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "github"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#0969da",
-      "hover": "#0c5fc5",
-      "active": "#0d69d9",
-      "foreground": "#ffffff",
-      "muted": "#0969da80",
-      "emphasis": "#0c5fc5"
-    },
-    "surface": {
-      "background": "#ffffff",
-      "foreground": "#1e2329",
-      "muted": "#f2f3f3",
-      "mutedForeground": "#57606a",
-      "elevated": "#f9f9f9",
-      "elevatedForeground": "#1e2329",
-      "overlay": "#ffffff33",
-      "subtle": "#eaeaeb"
-    },
-    "interactive": {
-      "border": "#cacbcc",
-      "borderHover": "#bcbec0",
-      "borderFocus": "#0d69d9",
-      "selection": "#1e232916",
-      "selectionForeground": "#1e2329",
-      "focus": "#0d69d9",
-      "focusRing": "#0d69d947",
-      "cursor": "#0e1319",
-      "hover": "#1e23290e",
-      "active": "#1e232916"
-    },
-    "status": {
-      "error": "#cf222e",
-      "errorForeground": "#ffffff",
-      "errorBackground": "#ffe2df",
-      "errorBorder": "#ffa69f",
-      "warning": "#9a6700",
-      "warningForeground": "#ffffff",
-      "warningBackground": "#ffe6c4",
-      "warningBorder": "#f1b55c",
-      "success": "#1a7f37",
-      "successForeground": "#ffffff",
-      "successBackground": "#bffcc6",
-      "successBorder": "#76dc88",
-      "info": "#bc4c00",
-      "infoForeground": "#ffffff",
-      "infoBackground": "#ffe3d8",
-      "infoBorder": "#ffa983"
-    },
-    "pr": {
-      "open": "#1a7f37",
-      "draft": "#57606a",
-      "blocked": "#9a6700",
-      "merged": "#1b7c83",
-      "closed": "#cf222e"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f9f9f9",
-        "foreground": "#1e2329",
-        "comment": "#57606a",
-        "keyword": "#cf222e",
-        "string": "#0969da",
-        "number": "#1b7c83",
-        "function": "#1b7c83",
-        "variable": "#bc4c00",
-        "type": "#bc4c00",
-        "operator": "#cf222e"
-      },
-      "tokens": {
-        "commentDoc": "#57606a",
-        "stringEscape": "#1e2329",
-        "keywordImport": "#cf222e",
-        "storageModifier": "#cf222e",
-        "functionCall": "#1b7c83",
-        "method": "#1b7c83",
-        "variableProperty": "#1b7c83",
-        "variableOther": "#bc4c00",
-        "variableGlobal": "#1b7c83",
-        "variableLocal": "#24292f",
-        "parameter": "#bc4c00",
-        "constant": "#1b7c83",
-        "class": "#bc4c00",
-        "className": "#bc4c00",
-        "interface": "#bc4c00",
-        "struct": "#bc4c00",
-        "enum": "#bc4c00",
-        "typeParameter": "#bc4c00",
-        "namespace": "#bc4c00",
-        "module": "#cf222e",
-        "tag": "#cf222e",
-        "jsxTag": "#cf222e",
-        "tagAttribute": "#1b7c83",
-        "tagAttributeValue": "#0969da",
-        "boolean": "#1b7c83",
-        "decorator": "#cf222e",
-        "label": "#1b7c83",
-        "punctuation": "#24292f",
-        "macro": "#cf222e",
-        "preprocessor": "#cf222e",
-        "regex": "#1e2329",
-        "url": "#0c5fc5",
-        "key": "#1b7c83",
-        "exception": "#cf222e"
-      },
-      "highlights": {
-        "diffAdded": "#396e42",
-        "diffAddedBackground": "#f2fdf3",
-        "diffRemoved": "#ab272b",
-        "diffRemovedBackground": "#fff7f7",
-        "diffModified": "#785105",
-        "diffModifiedBackground": "#f3f5f9",
-        "lineNumber": "#7b828a",
-        "lineNumberActive": "#1e2329"
-      }
-    },
-    "header": {
-      "background": "#ffffff",
-      "foreground": "#1e2329",
-      "border": "#cacbcc",
-      "icon": "#3a3f44",
-      "hover": "#eaeaeb"
-    },
-    "sidebar": {
-      "background": "#f5f5f4",
-      "foreground": "#57606a",
-      "border": "#cacbcc",
-      "icon": "#cdcecc",
-      "hover": "#eaeaeb",
-      "active": "#deebfe",
-      "accent": "#0969da",
-      "accentForeground": "#ffffff"
-    },
-    "chat": {
-      "background": "#ffffff",
-      "userMessage": "#1e2329",
-      "userMessageBackground": "#f2f3f3",
-      "assistantMessage": "#1e2329",
-      "assistantMessageBackground": "#ffffff",
-      "timestamp": "#7b828a",
-      "divider": "#e4e4e5",
-      "typing": "#57606a"
-    },
-    "markdown": {
-      "heading1": "#0969da",
-      "heading2": "#0969da",
-      "heading3": "#0e1319",
-      "heading4": "#1e2329",
-      "link": "#0969da",
-      "linkHover": "#1b7c83",
-      "inlineCode": "#bf3989",
-      "inlineCodeBackground": "#f2f3f3",
-      "blockquote": "#57606a",
-      "blockquoteBorder": "#cacbcc",
-      "listMarker": "#0969da99",
-      "bold": "#bc4c00",
-      "italic": "#9a6700",
-      "strikethrough": "#57606a",
-      "hr": "#d0d7de"
-    },
-    "tools": {
-      "background": "#f2f3f3",
-      "border": "#e4e4e5",
-      "headerHover": "#eaeaeb",
-      "icon": "#cdcecc",
-      "title": "#1e2329",
-      "description": "#57606a",
-      "edit": {
-        "added": "#396e42",
-        "addedBackground": "#f2fdf3",
-        "removed": "#d54645",
-        "removedBackground": "#fff7f7",
-        "modified": "#785105",
-        "modifiedBackground": "#f3f5f9",
-        "lineNumber": "#7b828a"
-      },
-      "bash": {
-        "background": "#f9f9f9",
-        "foreground": "#1e2329",
-        "info": "#bc4c00",
-        "warning": "#9a6700",
-        "error": "#cf222e"
-      },
-      "lsp": {
-        "background": "#f9f9f9",
-        "foreground": "#1e2329",
-        "info": "#bc4c00",
-        "warning": "#9a6700",
-        "error": "#cf222e"
-      }
-    },
-    "forms": {
-      "inputBackground": "#ffffff",
-      "inputForeground": "#1e2329",
-      "inputBorder": "#e4e4e5",
-      "inputBorderHover": "#d7d8d9",
-      "inputBorderFocus": "#0d69d9",
-      "inputPlaceholder": "#7b828a",
-      "inputDisabled": "#efefee",
-      "inputSelection": "#deebfe",
-      "label": "#57606a",
-      "helperText": "#7b828a"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#0969da",
-        "fg": "#ffffff",
-        "border": "#9dc3fb",
-        "hover": "#0c5fc5",
-        "active": "#0d69d9",
-        "disabled": "#d2d3d5"
-      },
-      "secondary": {
-        "bg": "#f9f9f9",
-        "fg": "#1e2329",
-        "border": "#cacbcc",
-        "hover": "#f2f3f3",
-        "active": "#eaeaeb",
-        "disabled": "#efefee"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#1e2329",
-        "border": "#00000000",
-        "hover": "#f2f3f3",
-        "active": "#eaeaeb",
-        "disabled": "#7b828a"
-      },
-      "destructive": {
-        "bg": "#cf222e",
-        "fg": "#ffffff",
-        "border": "#ffa69f",
-        "hover": "#fcd5d2",
-        "active": "#ce252f",
-        "disabled": "#efefee"
-      }
-    },
-    "modal": {
-      "background": "#f9f9f9",
-      "foreground": "#1e2329",
-      "border": "#cacbcc",
-      "overlay": "#ffffff3d"
-    },
-    "popover": {
-      "background": "#f9f9f9",
-      "foreground": "#1e2329",
-      "border": "#cacbcc",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f9f9f9",
-      "foreground": "#1e2329",
-      "border": "#cacbcc",
-      "inputBackground": "#ffffff",
-      "selectedBackground": "#deebfe",
-      "selectedForeground": "#1e2329",
-      "muted": "#57606a"
-    },
-    "fileAttachment": {
-      "background": "#f2f3f3",
-      "foreground": "#1e2329",
-      "border": "#e4e4e5",
-      "icon": "#cdcecc",
-      "removeHover": "#ffe2df"
-    },
-    "sessions": {
-      "background": "#ffffff",
-      "foreground": "#1e2329",
-      "mutedForeground": "#57606a",
-      "border": "#ededee",
-      "hover": "#eaeaeb",
-      "active": "#deebfe"
-    },
-    "modelSelector": {
-      "background": "#f9f9f9",
-      "foreground": "#1e2329",
-      "border": "#cacbcc",
-      "selectedBackground": "#deebfe",
-      "selectedForeground": "#1e2329"
-    },
-    "permissions": {
-      "background": "#f9f9f9",
-      "foreground": "#1e2329",
-      "border": "#cacbcc",
-      "allow": "#1a7f37",
-      "allowBackground": "#bffcc6",
-      "deny": "#cf222e",
-      "denyBackground": "#ffe2df"
-    },
-    "loading": {
-      "spinner": "#0969da",
-      "spinnerTrack": "#eaeaeb",
-      "skeleton": "#f2f3f3",
-      "shimmer": "#eaeaeb"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#1e232926",
-      "thumbHover": "#1e232940"
-    },
-    "badges": {
-      "default": {
-        "bg": "#f2f3f3",
-        "fg": "#1e2329",
-        "border": "#e4e4e5"
-      },
-      "info": {
-        "bg": "#ffe3d8",
-        "fg": "#bc4c00",
-        "border": "#ffa983"
-      },
-      "success": {
-        "bg": "#bffcc6",
-        "fg": "#1a7f37",
-        "border": "#76dc88"
-      },
-      "warning": {
-        "bg": "#ffe6c4",
-        "fg": "#9a6700",
-        "border": "#f1b55c"
-      },
-      "error": {
-        "bg": "#ffe2df",
-        "fg": "#cf222e",
-        "border": "#ffa69f"
-      }
-    },
-    "toast": {
-      "background": "#f9f9f9",
-      "foreground": "#1e2329",
-      "border": "#cacbcc",
-      "success": {
-        "background": "#bffcc6",
-        "foreground": "#1a7f37",
-        "border": "#76dc88"
-      },
-      "warning": {
-        "background": "#ffe6c4",
-        "foreground": "#9a6700",
-        "border": "#f1b55c"
-      },
-      "error": {
-        "background": "#ffe2df",
-        "foreground": "#cf222e",
-        "border": "#ffa69f"
-      },
-      "info": {
-        "background": "#ffe3d8",
-        "foreground": "#bc4c00",
-        "border": "#ffa983"
-      }
-    },
-    "emptyState": {
-      "icon": "#57606a",
-      "title": "#1e2329",
-      "description": "#57606a",
-      "border": "#ededee"
-    },
-    "table": {
-      "border": "#ededee",
-      "headerBackground": "#f9f9f9",
-      "headerForeground": "#1e2329",
-      "rowHover": "#eaeaeb",
-      "rowSelected": "#deebfe"
-    },
-    "charts": {
-      "series": [
-        "#0969da",
-        "#bc4c00",
-        "#1a7f37",
-        "#9a6700",
-        "#cf222e"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#0d69d9",
-      "selection": "#deebfe",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #0969da40"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/gruvbox-dark.json b/packages/ui/src/lib/theme/themes/gruvbox-dark.json
index d4ab4883..ccaa45a4 100644
--- a/packages/ui/src/lib/theme/themes/gruvbox-dark.json
+++ b/packages/ui/src/lib/theme/themes/gruvbox-dark.json
@@ -27,10 +27,10 @@
       "elevated": "#25292b",
       "elevatedForeground": "#EBDBB2",
       "overlay": "#FBF1C720",
-      "subtle": "#3e3c3a"
+      "subtle": "#343230"
     },
     "interactive": {
-      "border": "#504945",
+      "border": "#453f3b",
       "borderHover": "#5A524B",
       "borderFocus": "#7C6F64",
       "selection": "#5a5647db",
diff --git a/packages/ui/src/lib/theme/themes/gruvbox-light.json b/packages/ui/src/lib/theme/themes/gruvbox-light.json
index ec019e9e..6e319762 100644
--- a/packages/ui/src/lib/theme/themes/gruvbox-light.json
+++ b/packages/ui/src/lib/theme/themes/gruvbox-light.json
@@ -20,26 +20,26 @@
       "emphasis": "#388288"
     },
     "surface": {
-      "background": "#FBF1C7",
+      "background": "#f8f1d5",
       "foreground": "#3C3836",
       "muted": "#F2E5BC",
       "mutedForeground": "#7C6F64",
       "elevated": "#efebcd",
       "elevatedForeground": "#3C3836",
       "overlay": "#28282820",
-      "subtle": "#FDF9E8"
+      "subtle": "#f3efde"
     },
     "interactive": {
-      "border": "#D5C4A1",
+      "border": "#e8d7b7",
       "borderHover": "#C9B897",
       "borderFocus": "#A89984",
-      "selection": "#fffdfdec",
+      "selection": "#f1eaeaec",
       "selectionForeground": "#282828",
       "focus": "#076678",
       "focusRing": "#07667840",
       "cursor": "#282828",
       "hover": "#fffdfdb3",
-      "active": "#fffdfdcf"
+      "active": "#f1eaeaec"
     },
     "status": {
       "error": "#9D0006",
diff --git a/packages/ui/src/lib/theme/themes/index.ts b/packages/ui/src/lib/theme/themes/index.ts
index 7fc83efb..7934fa0f 100644
--- a/packages/ui/src/lib/theme/themes/index.ts
+++ b/packages/ui/src/lib/theme/themes/index.ts
@@ -3,16 +3,16 @@ import { presetThemes } from './presets';
 import { withPrColors } from './prColors';
 import flexokiLightRaw from './flexoki-light.json';
 import flexokiDarkRaw from './flexoki-dark.json';
-import openchamberLightRaw from './fields-of-the-shire-light.json';
-import openchamberDarkRaw from './fields-of-the-shire-dark.json';
+import openchamberLightRaw from './openchamber-light.json';
+import openchamberDarkRaw from './openchamber-dark.json';
 
 const flexokiLightTheme = withPrColors(flexokiLightRaw as Theme);
 const flexokiDarkTheme = withPrColors(flexokiDarkRaw as Theme);
 const openchamberLightTheme = withPrColors(openchamberLightRaw as Theme);
 const openchamberDarkTheme = withPrColors(openchamberDarkRaw as Theme);
 
-export const DEFAULT_LIGHT_THEME_ID = 'flexoki-light' as const;
-export const DEFAULT_DARK_THEME_ID = 'flexoki-dark' as const;
+export const DEFAULT_LIGHT_THEME_ID = 'openchamber-light' as const;
+export const DEFAULT_DARK_THEME_ID = 'openchamber-dark' as const;
 
 export const themes: Theme[] = [
   openchamberLightTheme,
diff --git a/packages/ui/src/lib/theme/themes/jetbrains-dark.json b/packages/ui/src/lib/theme/themes/jetbrains-dark.json
index 6aa036ad..a3ec961b 100644
--- a/packages/ui/src/lib/theme/themes/jetbrains-dark.json
+++ b/packages/ui/src/lib/theme/themes/jetbrains-dark.json
@@ -30,10 +30,10 @@
       "elevated": "#2B2D30",
       "elevatedForeground": "#DFE1E5",
       "overlay": "#00000080",
-      "subtle": "#2c2d32"
+      "subtle": "#28292c"
     },
     "interactive": {
-      "border": "#474a51",
+      "border": "#383a3f",
       "borderHover": "#4B5059",
       "borderFocus": "#6796f5",
       "selection": "#43454A",
@@ -145,7 +145,7 @@
     },
     "chat": {
       "userMessage": "#DFE1E5",
-      "userMessageBackground": "#3a5b9d76",
+      "userMessageBackground": "#2a3b5d76",
       "assistantMessage": "#DFE1E5",
       "assistantMessageBackground": "#1E1F22",
       "timestamp": "#7A7E85",
diff --git a/packages/ui/src/lib/theme/themes/jetbrains-light.json b/packages/ui/src/lib/theme/themes/jetbrains-light.json
index 91e7cbd9..091251f8 100644
--- a/packages/ui/src/lib/theme/themes/jetbrains-light.json
+++ b/packages/ui/src/lib/theme/themes/jetbrains-light.json
@@ -30,10 +30,10 @@
       "elevated": "#FFFFFF",
       "elevatedForeground": "#000000",
       "overlay": "#00000025",
-      "subtle": "#ecf0f8"
+      "subtle": "#f5f8fd"
     },
     "interactive": {
-      "border": "#cfd3de",
+      "border": "#dde0ea",
       "borderHover": "#AEB3C2",
       "borderFocus": "#0055FF",
       "selection": "#DFE1E5",
@@ -145,7 +145,7 @@
     },
     "chat": {
       "userMessage": "#000000",
-      "userMessageBackground": "#E8F1FF",
+      "userMessageBackground": "#eff4fd",
       "assistantMessage": "#000000",
       "assistantMessageBackground": "#F7F8FA",
       "timestamp": "#767A8A",
diff --git a/packages/ui/src/lib/theme/themes/kanagawa-dark.json b/packages/ui/src/lib/theme/themes/kanagawa-dark.json
index 020a8e93..a98416e7 100644
--- a/packages/ui/src/lib/theme/themes/kanagawa-dark.json
+++ b/packages/ui/src/lib/theme/themes/kanagawa-dark.json
@@ -25,14 +25,14 @@
       "background": "#1F1F28",
       "foreground": "#DCD7BA",
       "muted": "#23232d",
-      "mutedForeground": "#7e7e77",
+      "mutedForeground": "#8b8b85",
       "elevated": "#2A2A37",
       "elevatedForeground": "#DCD7BA",
       "overlay": "#16161DCC",
-      "subtle": "#2f2f3d"
+      "subtle": "#2a2a36"
     },
     "interactive": {
-      "border": "#363646",
+      "border": "#333343",
       "borderHover": "#54546D",
       "borderFocus": "#7FB4CA",
       "selection": "#729fb333",
@@ -155,7 +155,7 @@
       "headerHover": "#36364650",
       "icon": "#afad9c",
       "title": "#DCD7BA",
-      "description": "#5A595B",
+      "description": "#818182",
       "edit": {
         "added": "#98BB6C",
         "addedBackground": "#98BB6C25",
diff --git a/packages/ui/src/lib/theme/themes/kanagawa-light.json b/packages/ui/src/lib/theme/themes/kanagawa-light.json
index 6e294288..ccf077f9 100644
--- a/packages/ui/src/lib/theme/themes/kanagawa-light.json
+++ b/packages/ui/src/lib/theme/themes/kanagawa-light.json
@@ -17,22 +17,22 @@
       "base": "#4D699B",
       "hover": "#6693BF",
       "active": "#5D57A3",
-      "foreground": "#F2ECBC",
+      "foreground": "#f6f3d6",
       "muted": "#4D699B80",
       "emphasis": "#6693BF"
     },
     "surface": {
-      "background": "#F2ECBC",
+      "background": "#f6f3d6",
       "foreground": "#545464",
-      "muted": "#E7DBA0",
+      "muted": "#ece6c8",
       "mutedForeground": "#6c6c67",
       "elevated": "#eae4bf",
       "elevatedForeground": "#545464",
       "overlay": "#54546433",
-      "subtle": "#f4fff0"
+      "subtle": "#e6f0e3"
     },
     "interactive": {
-      "border": "#bfbaa4",
+      "border": "#d7d1ba",
       "borderHover": "#8A8980",
       "borderFocus": "#4D699B",
       "selection": "#e9f3e5cf",
@@ -45,7 +45,7 @@
     },
     "status": {
       "error": "#E82424",
-      "errorForeground": "#F2ECBC",
+      "errorForeground": "#f6f3d6",
       "errorBackground": "#E8242420",
       "errorBorder": "#E8242450",
       "warning": "#DE9800",
@@ -53,11 +53,11 @@
       "warningBackground": "#DE980020",
       "warningBorder": "#DE980050",
       "success": "#6F894E",
-      "successForeground": "#F2ECBC",
+      "successForeground": "#f6f3d6",
       "successBackground": "#98BB6C20",
       "successBorder": "#6F894E50",
       "info": "#4D699B",
-      "infoForeground": "#F2ECBC",
+      "infoForeground": "#f6f3d6",
       "infoBackground": "#6693BF20",
       "infoBorder": "#4D699B50"
     },
@@ -145,7 +145,7 @@
       "userMessage": "#545464",
       "userMessageBackground": "#e6f2e1",
       "assistantMessage": "#545464",
-      "assistantMessageBackground": "#F2ECBC",
+      "assistantMessageBackground": "#f6f3d6",
       "timestamp": "#716E61",
       "divider": "#716E61"
     },
diff --git a/packages/ui/src/lib/theme/themes/lucent-orng-dark.json b/packages/ui/src/lib/theme/themes/lucent-orng-dark.json
deleted file mode 100644
index a33f2f15..00000000
--- a/packages/ui/src/lib/theme/themes/lucent-orng-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "lucent-orng-dark",
-    "name": "Lucent Orng",
-    "description": "Ported from OpenCode Lucent Orng theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "lucent-orng"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#EC5B2B",
-      "hover": "#da4f1f",
-      "active": "#be3c07",
-      "foreground": "#151313",
-      "muted": "#EC5B2B80",
-      "emphasis": "#fdc4b3"
-    },
-    "surface": {
-      "background": "#1a0c08",
-      "foreground": "#eeeeee",
-      "muted": "#281b17",
-      "mutedForeground": "#808080",
-      "elevated": "#221411",
-      "elevatedForeground": "#eeeeee",
-      "overlay": "#1a0c08cc",
-      "subtle": "#2f221f"
-    },
-    "interactive": {
-      "border": "#524845",
-      "borderHover": "#5a514e",
-      "borderFocus": "#be3c07",
-      "selection": "#eeeeee1f",
-      "selectionForeground": "#eeeeee",
-      "focus": "#be3c07",
-      "focusRing": "#be3c0761",
-      "cursor": "#fdfdfd",
-      "hover": "#eeeeee17",
-      "active": "#eeeeee1f"
-    },
-    "status": {
-      "error": "#e06c75",
-      "errorForeground": "#151313",
-      "errorBackground": "#5c0318",
-      "errorBorder": "#7c0a25",
-      "warning": "#EC5B2B",
-      "warningForeground": "#151313",
-      "warningBackground": "#531906",
-      "warningBorder": "#752101",
-      "success": "#6ba1e6",
-      "successForeground": "#151313",
-      "successBackground": "#042e5d",
-      "successBorder": "#09417d",
-      "info": "#56b6c2",
-      "infoForeground": "#151313",
-      "infoBackground": "#05363b",
-      "infoBorder": "#0d4b51"
-    },
-    "pr": {
-      "open": "#6ba1e6",
-      "draft": "#808080",
-      "blocked": "#EC5B2B",
-      "merged": "#FFF7F1",
-      "closed": "#e06c75"
-    },
-    "syntax": {
-      "base": {
-        "background": "#221411",
-        "foreground": "#eeeeee",
-        "comment": "#808080",
-        "keyword": "#EC5B2B",
-        "string": "#6ba1e6",
-        "number": "#FFF7F1",
-        "function": "#56b6c2",
-        "variable": "#e06c75",
-        "type": "#e5c07b",
-        "operator": "#56b6c2"
-      },
-      "tokens": {
-        "commentDoc": "#808080",
-        "stringEscape": "#eeeeee",
-        "keywordImport": "#EC5B2B",
-        "storageModifier": "#EC5B2B",
-        "functionCall": "#56b6c2",
-        "method": "#56b6c2",
-        "variableProperty": "#56b6c2",
-        "variableOther": "#e06c75",
-        "variableGlobal": "#FFF7F1",
-        "variableLocal": "#eeeeee",
-        "parameter": "#e06c75",
-        "constant": "#FFF7F1",
-        "class": "#e5c07b",
-        "className": "#e5c07b",
-        "interface": "#e5c07b",
-        "struct": "#e5c07b",
-        "enum": "#e5c07b",
-        "typeParameter": "#e5c07b",
-        "namespace": "#e5c07b",
-        "module": "#EC5B2B",
-        "tag": "#EC5B2B",
-        "jsxTag": "#EC5B2B",
-        "tagAttribute": "#56b6c2",
-        "tagAttributeValue": "#6ba1e6",
-        "boolean": "#FFF7F1",
-        "decorator": "#EC5B2B",
-        "label": "#56b6c2",
-        "punctuation": "#eeeeee",
-        "macro": "#EC5B2B",
-        "preprocessor": "#EC5B2B",
-        "regex": "#eeeeee",
-        "url": "#fdc4b3",
-        "key": "#56b6c2",
-        "exception": "#e06c75"
-      },
-      "highlights": {
-        "diffAdded": "#b8d6fe",
-        "diffAddedBackground": "#021631",
-        "diffRemoved": "#fec2c4",
-        "diffRemovedBackground": "#30030a",
-        "diffModified": "#ffba92",
-        "diffModifiedBackground": "#28150f",
-        "lineNumber": "#5d5d5d",
-        "lineNumberActive": "#eeeeee"
-      }
-    },
-    "header": {
-      "background": "#1a0c08",
-      "foreground": "#eeeeee",
-      "border": "#524845",
-      "icon": "#9b9691",
-      "hover": "#2f221f"
-    },
-    "sidebar": {
-      "background": "#21130e",
-      "foreground": "#808080",
-      "border": "#524845",
-      "icon": "#342721",
-      "hover": "#2f221f",
-      "active": "#531906",
-      "accent": "#EC5B2B",
-      "accentForeground": "#151313"
-    },
-    "chat": {
-      "background": "#1a0c08",
-      "userMessage": "#eeeeee",
-      "userMessageBackground": "#281b17",
-      "assistantMessage": "#eeeeee",
-      "assistantMessageBackground": "#1a0c08",
-      "timestamp": "#5d5d5d",
-      "divider": "#413632",
-      "typing": "#808080"
-    },
-    "markdown": {
-      "heading1": "#EC5B2B",
-      "heading2": "#EC5B2B",
-      "heading3": "#fdfdfd",
-      "heading4": "#eeeeee",
-      "link": "#EC5B2B",
-      "linkHover": "#56b6c2",
-      "inlineCode": "#6ba1e6",
-      "inlineCodeBackground": "#281b17",
-      "blockquote": "#FFF7F1",
-      "blockquoteBorder": "#524845",
-      "listMarker": "#EC5B2B99",
-      "bold": "#EE7948",
-      "italic": "#e5c07b",
-      "strikethrough": "#808080",
-      "hr": "#808080"
-    },
-    "tools": {
-      "background": "#281b17",
-      "border": "#413632",
-      "headerHover": "#2f221f",
-      "icon": "#342721",
-      "title": "#eeeeee",
-      "description": "#808080",
-      "edit": {
-        "added": "#b8d6fe",
-        "addedBackground": "#021631",
-        "removed": "#e92b53",
-        "removedBackground": "#30030a",
-        "modified": "#ffba92",
-        "modifiedBackground": "#28150f",
-        "lineNumber": "#5d5d5d"
-      },
-      "bash": {
-        "background": "#221411",
-        "foreground": "#eeeeee",
-        "info": "#56b6c2",
-        "warning": "#EC5B2B",
-        "error": "#e06c75"
-      },
-      "lsp": {
-        "background": "#221411",
-        "foreground": "#eeeeee",
-        "info": "#56b6c2",
-        "warning": "#EC5B2B",
-        "error": "#e06c75"
-      }
-    },
-    "forms": {
-      "inputBackground": "#1d0f0b",
-      "inputForeground": "#eeeeee",
-      "inputBorder": "#413632",
-      "inputBorderHover": "#493f3c",
-      "inputBorderFocus": "#be3c07",
-      "inputPlaceholder": "#5d5d5d",
-      "inputDisabled": "#251813",
-      "inputSelection": "#9b3108",
-      "label": "#808080",
-      "helperText": "#5d5d5d"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#EC5B2B",
-        "fg": "#151313",
-        "border": "#752101",
-        "hover": "#da4f1f",
-        "active": "#be3c07",
-        "disabled": "#493f3c"
-      },
-      "secondary": {
-        "bg": "#221411",
-        "fg": "#eeeeee",
-        "border": "#524845",
-        "hover": "#281b17",
-        "active": "#2f221f",
-        "disabled": "#251813"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#eeeeee",
-        "border": "#00000000",
-        "hover": "#281b17",
-        "active": "#2f221f",
-        "disabled": "#5d5d5d"
-      },
-      "destructive": {
-        "bg": "#e06c75",
-        "fg": "#151313",
-        "border": "#7c0a25",
-        "hover": "#7c0a25",
-        "active": "#ce2245",
-        "disabled": "#251813"
-      }
-    },
-    "modal": {
-      "background": "#221411",
-      "foreground": "#eeeeee",
-      "border": "#524845",
-      "overlay": "#1a0c08d6"
-    },
-    "popover": {
-      "background": "#221411",
-      "foreground": "#eeeeee",
-      "border": "#524845",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#221411",
-      "foreground": "#eeeeee",
-      "border": "#524845",
-      "inputBackground": "#1d0f0b",
-      "selectedBackground": "#531906",
-      "selectedForeground": "#eeeeee",
-      "muted": "#808080"
-    },
-    "fileAttachment": {
-      "background": "#281b17",
-      "foreground": "#eeeeee",
-      "border": "#413632",
-      "icon": "#342721",
-      "removeHover": "#5c0318"
-    },
-    "sessions": {
-      "background": "#1a0c08",
-      "foreground": "#eeeeee",
-      "mutedForeground": "#808080",
-      "border": "#392d29",
-      "hover": "#2f221f",
-      "active": "#531906"
-    },
-    "modelSelector": {
-      "background": "#221411",
-      "foreground": "#eeeeee",
-      "border": "#524845",
-      "selectedBackground": "#531906",
-      "selectedForeground": "#eeeeee"
-    },
-    "permissions": {
-      "background": "#221411",
-      "foreground": "#eeeeee",
-      "border": "#524845",
-      "allow": "#6ba1e6",
-      "allowBackground": "#042e5d",
-      "deny": "#e06c75",
-      "denyBackground": "#5c0318"
-    },
-    "loading": {
-      "spinner": "#EC5B2B",
-      "spinnerTrack": "#2f221f",
-      "skeleton": "#281b17",
-      "shimmer": "#2f221f"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#eeeeee33",
-      "thumbHover": "#eeeeee57"
-    },
-    "badges": {
-      "default": {
-        "bg": "#281b17",
-        "fg": "#eeeeee",
-        "border": "#413632"
-      },
-      "info": {
-        "bg": "#05363b",
-        "fg": "#56b6c2",
-        "border": "#0d4b51"
-      },
-      "success": {
-        "bg": "#042e5d",
-        "fg": "#6ba1e6",
-        "border": "#09417d"
-      },
-      "warning": {
-        "bg": "#531906",
-        "fg": "#EC5B2B",
-        "border": "#752101"
-      },
-      "error": {
-        "bg": "#5c0318",
-        "fg": "#e06c75",
-        "border": "#7c0a25"
-      }
-    },
-    "toast": {
-      "background": "#221411",
-      "foreground": "#eeeeee",
-      "border": "#524845",
-      "success": {
-        "background": "#042e5d",
-        "foreground": "#6ba1e6",
-        "border": "#09417d"
-      },
-      "warning": {
-        "background": "#531906",
-        "foreground": "#EC5B2B",
-        "border": "#752101"
-      },
-      "error": {
-        "background": "#5c0318",
-        "foreground": "#e06c75",
-        "border": "#7c0a25"
-      },
-      "info": {
-        "background": "#05363b",
-        "foreground": "#56b6c2",
-        "border": "#0d4b51"
-      }
-    },
-    "emptyState": {
-      "icon": "#808080",
-      "title": "#eeeeee",
-      "description": "#808080",
-      "border": "#392d29"
-    },
-    "table": {
-      "border": "#392d29",
-      "headerBackground": "#221411",
-      "headerForeground": "#eeeeee",
-      "rowHover": "#2f221f",
-      "rowSelected": "#531906"
-    },
-    "charts": {
-      "series": [
-        "#EC5B2B",
-        "#56b6c2",
-        "#6ba1e6",
-        "#EC5B2B",
-        "#e06c75"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#be3c07",
-      "selection": "#531906",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #EC5B2B59"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/lucent-orng-light.json b/packages/ui/src/lib/theme/themes/lucent-orng-light.json
deleted file mode 100644
index 78b6b31a..00000000
--- a/packages/ui/src/lib/theme/themes/lucent-orng-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "lucent-orng-light",
-    "name": "Lucent Orng",
-    "description": "Ported from OpenCode Lucent Orng theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "lucent-orng"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#EC5B2B",
-      "hover": "#e14d17",
-      "active": "#f45214",
-      "foreground": "#000000",
-      "muted": "#EC5B2B80",
-      "emphasis": "#e14d17"
-    },
-    "surface": {
-      "background": "#fef7f3",
-      "foreground": "#181818",
-      "muted": "#f1eae6",
-      "mutedForeground": "#8a8a8a",
-      "elevated": "#f7f1ed",
-      "elevatedForeground": "#181818",
-      "overlay": "#fef7f333",
-      "subtle": "#e8e2de"
-    },
-    "interactive": {
-      "border": "#c6c1be",
-      "borderHover": "#b9b4b1",
-      "borderFocus": "#f45214",
-      "selection": "#18181816",
-      "selectionForeground": "#181818",
-      "focus": "#f45214",
-      "focusRing": "#f4521447",
-      "cursor": "#090909",
-      "hover": "#1818180e",
-      "active": "#18181816"
-    },
-    "status": {
-      "error": "#d1383d",
-      "errorForeground": "#ffffff",
-      "errorBackground": "#fde3e0",
-      "errorBorder": "#faa8a3",
-      "warning": "#EC5B2B",
-      "warningForeground": "#000000",
-      "warningBackground": "#ffe3da",
-      "warningBorder": "#fea88e",
-      "success": "#0062d1",
-      "successForeground": "#ffffff",
-      "successBackground": "#deebfe",
-      "successBorder": "#9ec3fa",
-      "info": "#318795",
-      "infoForeground": "#000000",
-      "infoBackground": "#bff5ff",
-      "infoBorder": "#77d1e1"
-    },
-    "pr": {
-      "open": "#0062d1",
-      "draft": "#8a8a8a",
-      "blocked": "#EC5B2B",
-      "merged": "#EC5B2B",
-      "closed": "#d1383d"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f7f1ed",
-        "foreground": "#181818",
-        "comment": "#8a8a8a",
-        "keyword": "#EC5B2B",
-        "string": "#0062d1",
-        "number": "#EC5B2B",
-        "function": "#318795",
-        "variable": "#d1383d",
-        "type": "#b0851f",
-        "operator": "#318795"
-      },
-      "tokens": {
-        "commentDoc": "#8a8a8a",
-        "stringEscape": "#181818",
-        "keywordImport": "#EC5B2B",
-        "storageModifier": "#EC5B2B",
-        "functionCall": "#318795",
-        "method": "#318795",
-        "variableProperty": "#318795",
-        "variableOther": "#d1383d",
-        "variableGlobal": "#EC5B2B",
-        "variableLocal": "#1a1a1a",
-        "parameter": "#d1383d",
-        "constant": "#EC5B2B",
-        "class": "#b0851f",
-        "className": "#b0851f",
-        "interface": "#b0851f",
-        "struct": "#b0851f",
-        "enum": "#b0851f",
-        "typeParameter": "#b0851f",
-        "namespace": "#b0851f",
-        "module": "#EC5B2B",
-        "tag": "#EC5B2B",
-        "jsxTag": "#EC5B2B",
-        "tagAttribute": "#318795",
-        "tagAttributeValue": "#0062d1",
-        "boolean": "#EC5B2B",
-        "decorator": "#EC5B2B",
-        "label": "#318795",
-        "punctuation": "#1a1a1a",
-        "macro": "#EC5B2B",
-        "preprocessor": "#EC5B2B",
-        "regex": "#181818",
-        "url": "#e14d17",
-        "key": "#318795",
-        "exception": "#d1383d"
-      },
-      "highlights": {
-        "diffAdded": "#2f60a4",
-        "diffAddedBackground": "#f6faff",
-        "diffRemoved": "#ae1a45",
-        "diffRemovedBackground": "#fef7f8",
-        "diffModified": "#FF8C00",
-        "diffModifiedBackground": "#fbefea",
-        "lineNumber": "#afafaf",
-        "lineNumberActive": "#181818"
-      }
-    },
-    "header": {
-      "background": "#fef7f3",
-      "foreground": "#181818",
-      "border": "#c6c1be",
-      "icon": "#323232",
-      "hover": "#e8e2de"
-    },
-    "sidebar": {
-      "background": "#f3ece8",
-      "foreground": "#8a8a8a",
-      "border": "#c6c1be",
-      "icon": "#c8c4c0",
-      "hover": "#e8e2de",
-      "active": "#ffe3da",
-      "accent": "#EC5B2B",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#fef7f3",
-      "userMessage": "#181818",
-      "userMessageBackground": "#f1eae6",
-      "assistantMessage": "#181818",
-      "assistantMessageBackground": "#fef7f3",
-      "timestamp": "#afafaf",
-      "divider": "#e2dcd8",
-      "typing": "#8a8a8a"
-    },
-    "markdown": {
-      "heading1": "#EC5B2B",
-      "heading2": "#EC5B2B",
-      "heading3": "#090909",
-      "heading4": "#181818",
-      "link": "#EC5B2B",
-      "linkHover": "#318795",
-      "inlineCode": "#0062d1",
-      "inlineCodeBackground": "#f1eae6",
-      "blockquote": "#b0851f",
-      "blockquoteBorder": "#c6c1be",
-      "listMarker": "#EC5B2B99",
-      "bold": "#EC5B2B",
-      "italic": "#b0851f",
-      "strikethrough": "#8a8a8a",
-      "hr": "#8a8a8a"
-    },
-    "tools": {
-      "background": "#f1eae6",
-      "border": "#e2dcd8",
-      "headerHover": "#e8e2de",
-      "icon": "#c8c4c0",
-      "title": "#181818",
-      "description": "#8a8a8a",
-      "edit": {
-        "added": "#2f60a4",
-        "addedBackground": "#f6faff",
-        "removed": "#e9055a",
-        "removedBackground": "#fef7f8",
-        "modified": "#FF8C00",
-        "modifiedBackground": "#fbefea",
-        "lineNumber": "#afafaf"
-      },
-      "bash": {
-        "background": "#f7f1ed",
-        "foreground": "#181818",
-        "info": "#318795",
-        "warning": "#EC5B2B",
-        "error": "#d1383d"
-      },
-      "lsp": {
-        "background": "#f7f1ed",
-        "foreground": "#181818",
-        "info": "#318795",
-        "warning": "#EC5B2B",
-        "error": "#d1383d"
-      }
-    },
-    "forms": {
-      "inputBackground": "#fef7f3",
-      "inputForeground": "#181818",
-      "inputBorder": "#e2dcd8",
-      "inputBorderHover": "#d4cecb",
-      "inputBorderFocus": "#f45214",
-      "inputPlaceholder": "#afafaf",
-      "inputDisabled": "#ece6e2",
-      "inputSelection": "#ffe3da",
-      "label": "#8a8a8a",
-      "helperText": "#afafaf"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#EC5B2B",
-        "fg": "#000000",
-        "border": "#fea88e",
-        "hover": "#e14d17",
-        "active": "#f45214",
-        "disabled": "#cfcac7"
-      },
-      "secondary": {
-        "bg": "#f7f1ed",
-        "fg": "#181818",
-        "border": "#c6c1be",
-        "hover": "#f1eae6",
-        "active": "#e8e2de",
-        "disabled": "#ece6e2"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#181818",
-        "border": "#00000000",
-        "hover": "#f1eae6",
-        "active": "#e8e2de",
-        "disabled": "#afafaf"
-      },
-      "destructive": {
-        "bg": "#d1383d",
-        "fg": "#ffffff",
-        "border": "#faa8a3",
-        "hover": "#fdd5d2",
-        "active": "#e1032b",
-        "disabled": "#ece6e2"
-      }
-    },
-    "modal": {
-      "background": "#f7f1ed",
-      "foreground": "#181818",
-      "border": "#c6c1be",
-      "overlay": "#fef7f33d"
-    },
-    "popover": {
-      "background": "#f7f1ed",
-      "foreground": "#181818",
-      "border": "#c6c1be",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f7f1ed",
-      "foreground": "#181818",
-      "border": "#c6c1be",
-      "inputBackground": "#fef7f3",
-      "selectedBackground": "#ffe3da",
-      "selectedForeground": "#181818",
-      "muted": "#8a8a8a"
-    },
-    "fileAttachment": {
-      "background": "#f1eae6",
-      "foreground": "#181818",
-      "border": "#e2dcd8",
-      "icon": "#c8c4c0",
-      "removeHover": "#fde3e0"
-    },
-    "sessions": {
-      "background": "#fef7f3",
-      "foreground": "#181818",
-      "mutedForeground": "#8a8a8a",
-      "border": "#ebe4e1",
-      "hover": "#e8e2de",
-      "active": "#ffe3da"
-    },
-    "modelSelector": {
-      "background": "#f7f1ed",
-      "foreground": "#181818",
-      "border": "#c6c1be",
-      "selectedBackground": "#ffe3da",
-      "selectedForeground": "#181818"
-    },
-    "permissions": {
-      "background": "#f7f1ed",
-      "foreground": "#181818",
-      "border": "#c6c1be",
-      "allow": "#0062d1",
-      "allowBackground": "#deebfe",
-      "deny": "#d1383d",
-      "denyBackground": "#fde3e0"
-    },
-    "loading": {
-      "spinner": "#EC5B2B",
-      "spinnerTrack": "#e8e2de",
-      "skeleton": "#f1eae6",
-      "shimmer": "#e8e2de"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#18181826",
-      "thumbHover": "#18181840"
-    },
-    "badges": {
-      "default": {
-        "bg": "#f1eae6",
-        "fg": "#181818",
-        "border": "#e2dcd8"
-      },
-      "info": {
-        "bg": "#bff5ff",
-        "fg": "#318795",
-        "border": "#77d1e1"
-      },
-      "success": {
-        "bg": "#deebfe",
-        "fg": "#0062d1",
-        "border": "#9ec3fa"
-      },
-      "warning": {
-        "bg": "#ffe3da",
-        "fg": "#EC5B2B",
-        "border": "#fea88e"
-      },
-      "error": {
-        "bg": "#fde3e0",
-        "fg": "#d1383d",
-        "border": "#faa8a3"
-      }
-    },
-    "toast": {
-      "background": "#f7f1ed",
-      "foreground": "#181818",
-      "border": "#c6c1be",
-      "success": {
-        "background": "#deebfe",
-        "foreground": "#0062d1",
-        "border": "#9ec3fa"
-      },
-      "warning": {
-        "background": "#ffe3da",
-        "foreground": "#EC5B2B",
-        "border": "#fea88e"
-      },
-      "error": {
-        "background": "#fde3e0",
-        "foreground": "#d1383d",
-        "border": "#faa8a3"
-      },
-      "info": {
-        "background": "#bff5ff",
-        "foreground": "#318795",
-        "border": "#77d1e1"
-      }
-    },
-    "emptyState": {
-      "icon": "#8a8a8a",
-      "title": "#181818",
-      "description": "#8a8a8a",
-      "border": "#ebe4e1"
-    },
-    "table": {
-      "border": "#ebe4e1",
-      "headerBackground": "#f7f1ed",
-      "headerForeground": "#181818",
-      "rowHover": "#e8e2de",
-      "rowSelected": "#ffe3da"
-    },
-    "charts": {
-      "series": [
-        "#EC5B2B",
-        "#318795",
-        "#0062d1",
-        "#EC5B2B",
-        "#d1383d"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#f45214",
-      "selection": "#ffe3da",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #EC5B2B40"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/mono-dark.json b/packages/ui/src/lib/theme/themes/mono-dark.json
index 72eb6946..af5ff59e 100644
--- a/packages/ui/src/lib/theme/themes/mono-dark.json
+++ b/packages/ui/src/lib/theme/themes/mono-dark.json
@@ -32,7 +32,7 @@
       "subtle": "#1A1A1A"
     },
     "interactive": {
-      "border": "#454545",
+      "border": "#2f2f2f",
       "borderHover": "#333333",
       "borderFocus": "#FFFFFF",
       "selection": "#ffffff1f",
diff --git a/packages/ui/src/lib/theme/themes/mono-light.json b/packages/ui/src/lib/theme/themes/mono-light.json
index e1d2f03d..3ff5ee45 100644
--- a/packages/ui/src/lib/theme/themes/mono-light.json
+++ b/packages/ui/src/lib/theme/themes/mono-light.json
@@ -32,7 +32,7 @@
       "subtle": "#F0F0F0"
     },
     "interactive": {
-      "border": "#D9D9D9",
+      "border": "#e3e3e3",
       "borderHover": "#B3B3B3",
       "borderFocus": "#000000",
       "selection": "#00000015",
diff --git a/packages/ui/src/lib/theme/themes/mono-plus-dark.json b/packages/ui/src/lib/theme/themes/mono-plus-dark.json
index 7aea4596..fb9660ee 100644
--- a/packages/ui/src/lib/theme/themes/mono-plus-dark.json
+++ b/packages/ui/src/lib/theme/themes/mono-plus-dark.json
@@ -31,7 +31,7 @@
       "subtle": "#1A1A1A"
     },
     "interactive": {
-      "border": "#454545",
+      "border": "#2f2f2f",
       "borderHover": "#333333",
       "borderFocus": "#FFFFFF",
       "selection": "#ffffff1f",
diff --git a/packages/ui/src/lib/theme/themes/mono-plus-light.json b/packages/ui/src/lib/theme/themes/mono-plus-light.json
index 95068223..b55ea07a 100644
--- a/packages/ui/src/lib/theme/themes/mono-plus-light.json
+++ b/packages/ui/src/lib/theme/themes/mono-plus-light.json
@@ -31,7 +31,7 @@
       "subtle": "#F0F0F0"
     },
     "interactive": {
-      "border": "#D9D9D9",
+      "border": "#e3e3e3",
       "borderHover": "#B3B3B3",
       "borderFocus": "#000000",
       "selection": "#00000015",
diff --git a/packages/ui/src/lib/theme/themes/monokai-dark.json b/packages/ui/src/lib/theme/themes/monokai-dark.json
index ee378f74..e3430268 100644
--- a/packages/ui/src/lib/theme/themes/monokai-dark.json
+++ b/packages/ui/src/lib/theme/themes/monokai-dark.json
@@ -27,7 +27,7 @@
       "elevated": "#21221a",
       "elevatedForeground": "#F8F8F2",
       "overlay": "#FFFFFF20",
-      "subtle": "#36372a"
+      "subtle": "#303126"
     },
     "interactive": {
       "border": "#343528",
diff --git a/packages/ui/src/lib/theme/themes/nightowl-dark.json b/packages/ui/src/lib/theme/themes/nightowl-dark.json
index a18136bb..40977356 100644
--- a/packages/ui/src/lib/theme/themes/nightowl-dark.json
+++ b/packages/ui/src/lib/theme/themes/nightowl-dark.json
@@ -27,10 +27,10 @@
       "elevated": "#001122",
       "elevatedForeground": "#D6DEEB",
       "overlay": "#FFFFFF20",
-      "subtle": "#0f283f"
+      "subtle": "#162431"
     },
     "interactive": {
-      "border": "#1D3B53",
+      "border": "#2b3339",
       "borderHover": "#234561",
       "borderFocus": "#82AAFF",
       "selection": "#555d6d94",
diff --git a/packages/ui/src/lib/theme/themes/nightowl-light.json b/packages/ui/src/lib/theme/themes/nightowl-light.json
index 1929b477..464363f3 100644
--- a/packages/ui/src/lib/theme/themes/nightowl-light.json
+++ b/packages/ui/src/lib/theme/themes/nightowl-light.json
@@ -30,7 +30,7 @@
       "subtle": "#F0F0F0"
     },
     "interactive": {
-      "border": "#D9D9D9",
+      "border": "#dfdfdf",
       "borderHover": "#CCCCCC",
       "borderFocus": "#4876D6",
       "selection": "#706e6e22",
diff --git a/packages/ui/src/lib/theme/themes/nord-dark.json b/packages/ui/src/lib/theme/themes/nord-dark.json
index 47844869..c99b1bd1 100644
--- a/packages/ui/src/lib/theme/themes/nord-dark.json
+++ b/packages/ui/src/lib/theme/themes/nord-dark.json
@@ -27,10 +27,10 @@
       "elevated": "#1C202A",
       "elevatedForeground": "#E5E9F0",
       "overlay": "#F8FAFC20",
-      "subtle": "#272f40"
+      "subtle": "#252c3c"
     },
     "interactive": {
-      "border": "#414755",
+      "border": "#383d49",
       "borderHover": "#383F50",
       "borderFocus": "#545B78",
       "selection": "#3e4a56fe",
diff --git a/packages/ui/src/lib/theme/themes/nord-light.json b/packages/ui/src/lib/theme/themes/nord-light.json
index 2e5895e1..3608055e 100644
--- a/packages/ui/src/lib/theme/themes/nord-light.json
+++ b/packages/ui/src/lib/theme/themes/nord-light.json
@@ -27,10 +27,10 @@
       "elevated": "#e7ebf5",
       "elevatedForeground": "#2E3440",
       "overlay": "#1F253020",
-      "subtle": "#dee4f0"
+      "subtle": "#e3e7ee"
     },
     "interactive": {
-      "border": "#c5cbd6",
+      "border": "#cfd5df",
       "borderHover": "#C9D0DE",
       "borderFocus": "#9CA4BA",
       "selection": "#c6ccd881",
diff --git a/packages/ui/src/lib/theme/themes/oc-2-dark.json b/packages/ui/src/lib/theme/themes/oc-2-dark.json
deleted file mode 100644
index 2d11712d..00000000
--- a/packages/ui/src/lib/theme/themes/oc-2-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "oc-2-dark",
-    "name": "OC-2",
-    "description": "Ported from OpenCode OC-2 theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "oc-2"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#fab283",
-      "hover": "#f88524",
-      "active": "#1456f7",
-      "foreground": "#000000",
-      "muted": "#fab28380",
-      "emphasis": "#c0d4fb"
-    },
-    "surface": {
-      "background": "#121212",
-      "foreground": "#f1ece8",
-      "muted": "#1b1b1a",
-      "mutedForeground": "#cdc8c5",
-      "elevated": "#151414",
-      "elevatedForeground": "#f1ece8",
-      "overlay": "#121212cc",
-      "subtle": "#282727"
-    },
-    "interactive": {
-      "border": "#4d4c4a",
-      "borderHover": "#565453",
-      "borderFocus": "#1456f7",
-      "selection": "#f1ece81f",
-      "selectionForeground": "#f1ece8",
-      "focus": "#1456f7",
-      "focusRing": "#1456f761",
-      "cursor": "#fefdfd",
-      "hover": "#f1ece817",
-      "active": "#f1ece81f"
-    },
-    "status": {
-      "error": "#fc533a",
-      "errorForeground": "#151313",
-      "errorBackground": "#5a0c03",
-      "errorBorder": "#7a1608",
-      "warning": "#fcd53a",
-      "warningForeground": "#151313",
-      "warningBackground": "#382e05",
-      "warningBorder": "#4e410b",
-      "success": "#12c905",
-      "successForeground": "#151313",
-      "successBackground": "#083a05",
-      "successBorder": "#10500d",
-      "info": "#edb2f1",
-      "infoForeground": "#151313",
-      "infoBackground": "#4d0853",
-      "infoBorder": "#651b6c"
-    },
-    "pr": {
-      "open": "#12c905",
-      "draft": "#cdc8c5",
-      "blocked": "#fcd53a",
-      "merged": "#93e9f6",
-      "closed": "#fc533a"
-    },
-    "syntax": {
-      "base": {
-        "background": "#1a1a1a",
-        "foreground": "#f1ece8",
-        "comment": "#8f8f8f",
-        "keyword": "#edb2f1",
-        "string": "#00ceb9",
-        "number": "#93e9f6",
-        "function": "#fab283",
-        "variable": "#fefdfd",
-        "type": "#fcd53a",
-        "operator": "#cdc8c5"
-      },
-      "tokens": {
-        "commentDoc": "#8f8f8f",
-        "stringEscape": "#f1ece8",
-        "keywordImport": "#edb2f1",
-        "storageModifier": "#edb2f1",
-        "functionCall": "#fab283",
-        "method": "#fab283",
-        "variableProperty": "#fab283",
-        "variableOther": "#fefdfd",
-        "variableGlobal": "#93e9f6",
-        "variableLocal": "#cdc8c5",
-        "parameter": "#fefdfd",
-        "constant": "#93e9f6",
-        "class": "#fcd53a",
-        "className": "#fcd53a",
-        "interface": "#fcd53a",
-        "struct": "#fcd53a",
-        "enum": "#fcd53a",
-        "typeParameter": "#fcd53a",
-        "namespace": "#fcd53a",
-        "module": "#edb2f1",
-        "tag": "#edb2f1",
-        "jsxTag": "#edb2f1",
-        "tagAttribute": "#fab283",
-        "tagAttributeValue": "#00ceb9",
-        "boolean": "#93e9f6",
-        "decorator": "#edb2f1",
-        "label": "#fab283",
-        "punctuation": "#cdc8c5",
-        "macro": "#edb2f1",
-        "preprocessor": "#edb2f1",
-        "regex": "#f1ece8",
-        "url": "#c0d4fb",
-        "key": "#fab283",
-        "exception": "#fc533a"
-      },
-      "highlights": {
-        "diffAdded": "#c4ffc0",
-        "diffAddedBackground": "#011d02",
-        "diffRemoved": "#fab283",
-        "diffRemovedBackground": "#310401",
-        "diffModified": "#fde280",
-        "diffModifiedBackground": "#151820",
-        "lineNumber": "#afaca9",
-        "lineNumberActive": "#f1ece8"
-      }
-    },
-    "header": {
-      "background": "#121212",
-      "foreground": "#f1ece8",
-      "border": "#4d4c4a",
-      "icon": "#999794",
-      "hover": "#282727"
-    },
-    "sidebar": {
-      "background": "#191919",
-      "foreground": "#cdc8c5",
-      "border": "#4d4c4a",
-      "icon": "#2c2c2b",
-      "hover": "#282727",
-      "active": "#00207d",
-      "accent": "#fab283",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#121212",
-      "userMessage": "#f1ece8",
-      "userMessageBackground": "#202020",
-      "assistantMessage": "#f1ece8",
-      "assistantMessageBackground": "#121212",
-      "timestamp": "#afaca9",
-      "divider": "#3b3a39",
-      "typing": "#cdc8c5"
-    },
-    "markdown": {
-      "heading1": "#fed6bd",
-      "heading2": "#fed6bd",
-      "heading3": "#fefdfd",
-      "heading4": "#f1ece8",
-      "link": "#cfdffd",
-      "linkHover": "#facffe",
-      "inlineCode": "#94fd8b",
-      "inlineCodeBackground": "#202020",
-      "blockquote": "#fde280",
-      "blockquoteBorder": "#4d4c4a",
-      "listMarker": "#cfdffd99",
-      "bold": "#facffe",
-      "italic": "#fde280",
-      "strikethrough": "#cdc8c5",
-      "hr": "#4d4c4a"
-    },
-    "tools": {
-      "background": "#202020",
-      "border": "#3b3a39",
-      "headerHover": "#282727",
-      "icon": "#2c2c2b",
-      "title": "#f1ece8",
-      "description": "#cdc8c5",
-      "edit": {
-        "added": "#c4ffc0",
-        "addedBackground": "#011d02",
-        "removed": "#ec2f14",
-        "removedBackground": "#310401",
-        "modified": "#fde280",
-        "modifiedBackground": "#151820",
-        "lineNumber": "#afaca9"
-      },
-      "bash": {
-        "background": "#1a1a1a",
-        "foreground": "#f1ece8",
-        "info": "#edb2f1",
-        "warning": "#fcd53a",
-        "error": "#fc533a"
-      },
-      "lsp": {
-        "background": "#1a1a1a",
-        "foreground": "#f1ece8",
-        "info": "#edb2f1",
-        "warning": "#fcd53a",
-        "error": "#fc533a"
-      }
-    },
-    "forms": {
-      "inputBackground": "#151515",
-      "inputForeground": "#f1ece8",
-      "inputBorder": "#3b3a39",
-      "inputBorderHover": "#444342",
-      "inputBorderFocus": "#1456f7",
-      "inputPlaceholder": "#afaca9",
-      "inputDisabled": "#1d1d1d",
-      "inputSelection": "#0643da",
-      "label": "#cdc8c5",
-      "helperText": "#afaca9"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#fab283",
-        "fg": "#000000",
-        "border": "#022fa6",
-        "hover": "#f88524",
-        "active": "#1456f7",
-        "disabled": "#444342"
-      },
-      "secondary": {
-        "bg": "#1a1a1a",
-        "fg": "#f1ece8",
-        "border": "#4d4c4a",
-        "hover": "#202020",
-        "active": "#282727",
-        "disabled": "#1d1d1d"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#f1ece8",
-        "border": "#00000000",
-        "hover": "#202020",
-        "active": "#282727",
-        "disabled": "#afaca9"
-      },
-      "destructive": {
-        "bg": "#fc533a",
-        "fg": "#151313",
-        "border": "#7a1608",
-        "hover": "#1F0603",
-        "active": "#cb321c",
-        "disabled": "#1d1d1d"
-      }
-    },
-    "modal": {
-      "background": "#1a1a1a",
-      "foreground": "#f1ece8",
-      "border": "#4d4c4a",
-      "overlay": "#121212d6"
-    },
-    "popover": {
-      "background": "#1a1a1a",
-      "foreground": "#f1ece8",
-      "border": "#4d4c4a",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#1a1a1a",
-      "foreground": "#f1ece8",
-      "border": "#4d4c4a",
-      "inputBackground": "#151515",
-      "selectedBackground": "#00207d",
-      "selectedForeground": "#f1ece8",
-      "muted": "#cdc8c5"
-    },
-    "fileAttachment": {
-      "background": "#202020",
-      "foreground": "#f1ece8",
-      "border": "#3b3a39",
-      "icon": "#2c2c2b",
-      "removeHover": "#5a0c03"
-    },
-    "sessions": {
-      "background": "#121212",
-      "foreground": "#f1ece8",
-      "mutedForeground": "#cdc8c5",
-      "border": "#323131",
-      "hover": "#282727",
-      "active": "#00207d"
-    },
-    "modelSelector": {
-      "background": "#1a1a1a",
-      "foreground": "#f1ece8",
-      "border": "#4d4c4a",
-      "selectedBackground": "#00207d",
-      "selectedForeground": "#f1ece8"
-    },
-    "permissions": {
-      "background": "#1a1a1a",
-      "foreground": "#f1ece8",
-      "border": "#4d4c4a",
-      "allow": "#12c905",
-      "allowBackground": "#083a05",
-      "deny": "#fc533a",
-      "denyBackground": "#5a0c03"
-    },
-    "loading": {
-      "spinner": "#fab283",
-      "spinnerTrack": "#282727",
-      "skeleton": "#202020",
-      "shimmer": "#282727"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#f1ece833",
-      "thumbHover": "#f1ece857"
-    },
-    "badges": {
-      "default": {
-        "bg": "#202020",
-        "fg": "#f1ece8",
-        "border": "#3b3a39"
-      },
-      "info": {
-        "bg": "#4d0853",
-        "fg": "#edb2f1",
-        "border": "#651b6c"
-      },
-      "success": {
-        "bg": "#083a05",
-        "fg": "#12c905",
-        "border": "#10500d"
-      },
-      "warning": {
-        "bg": "#382e05",
-        "fg": "#fcd53a",
-        "border": "#4e410b"
-      },
-      "error": {
-        "bg": "#5a0c03",
-        "fg": "#fc533a",
-        "border": "#7a1608"
-      }
-    },
-    "toast": {
-      "background": "#1a1a1a",
-      "foreground": "#f1ece8",
-      "border": "#4d4c4a",
-      "success": {
-        "background": "#083a05",
-        "foreground": "#12c905",
-        "border": "#10500d"
-      },
-      "warning": {
-        "background": "#382e05",
-        "foreground": "#fcd53a",
-        "border": "#4e410b"
-      },
-      "error": {
-        "background": "#5a0c03",
-        "foreground": "#fc533a",
-        "border": "#7a1608"
-      },
-      "info": {
-        "background": "#4d0853",
-        "foreground": "#edb2f1",
-        "border": "#651b6c"
-      }
-    },
-    "emptyState": {
-      "icon": "#cdc8c5",
-      "title": "#f1ece8",
-      "description": "#cdc8c5",
-      "border": "#323131"
-    },
-    "table": {
-      "border": "#323131",
-      "headerBackground": "#1a1a1a",
-      "headerForeground": "#f1ece8",
-      "rowHover": "#282727",
-      "rowSelected": "#00207d"
-    },
-    "charts": {
-      "series": [
-        "#fab283",
-        "#edb2f1",
-        "#12c905",
-        "#fcd53a",
-        "#fc533a"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#1456f7",
-      "selection": "#00207d",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #034cff59"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/oc-2-light.json b/packages/ui/src/lib/theme/themes/oc-2-light.json
deleted file mode 100644
index b43fbf21..00000000
--- a/packages/ui/src/lib/theme/themes/oc-2-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "oc-2-light",
-    "name": "OC-2",
-    "description": "Ported from OpenCode OC-2 theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "oc-2"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#dcde8d",
-      "hover": "#d2d369",
-      "active": "#054dfd",
-      "foreground": "#000000",
-      "muted": "#dcde8d80",
-      "emphasis": "#0445e6"
-    },
-    "surface": {
-      "background": "#f8f8f8",
-      "foreground": "#161210",
-      "muted": "#ebebeb",
-      "mutedForeground": "#302c2a",
-      "elevated": "#f1f1f1",
-      "elevatedForeground": "#161210",
-      "overlay": "#f8f8f833",
-      "subtle": "#e2e2e2"
-    },
-    "interactive": {
-      "border": "#c1c0c0",
-      "borderHover": "#b4b2b2",
-      "borderFocus": "#054dfd",
-      "selection": "#16121016",
-      "selectionForeground": "#161210",
-      "focus": "#054dfd",
-      "focusRing": "#054dfd47",
-      "cursor": "#070504",
-      "hover": "#1612100e",
-      "active": "#16121016"
-    },
-    "status": {
-      "error": "#fc533a",
-      "errorForeground": "#000000",
-      "errorBackground": "#fde3de",
-      "errorBorder": "#faaa9b",
-      "warning": "#ffdc17",
-      "warningForeground": "#000000",
-      "warningBackground": "#feeb92",
-      "warningBorder": "#dec025",
-      "success": "#12c905",
-      "successForeground": "#000000",
-      "successBackground": "#bbffb4",
-      "successBorder": "#2ce822",
-      "info": "#a753ae",
-      "infoForeground": "#ffffff",
-      "infoBackground": "#fcdffe",
-      "infoBorder": "#f39cf9"
-    },
-    "pr": {
-      "open": "#12c905",
-      "draft": "#302c2a",
-      "blocked": "#ffdc17",
-      "merged": "#007b80",
-      "closed": "#fc533a"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f1f1f1",
-        "foreground": "#161210",
-        "comment": "#7a7a7a",
-        "keyword": "#a753ae",
-        "string": "#00ceb9",
-        "number": "#007b80",
-        "function": "#a753ae",
-        "variable": "#070504",
-        "type": "#8a6f00",
-        "operator": "#161210"
-      },
-      "tokens": {
-        "commentDoc": "#7a7a7a",
-        "stringEscape": "#161210",
-        "keywordImport": "#a753ae",
-        "storageModifier": "#a753ae",
-        "functionCall": "#a753ae",
-        "method": "#a753ae",
-        "variableProperty": "#a753ae",
-        "variableOther": "#070504",
-        "variableGlobal": "#007b80",
-        "variableLocal": "#161210",
-        "parameter": "#070504",
-        "constant": "#007b80",
-        "class": "#8a6f00",
-        "className": "#8a6f00",
-        "interface": "#8a6f00",
-        "struct": "#8a6f00",
-        "enum": "#8a6f00",
-        "typeParameter": "#8a6f00",
-        "namespace": "#8a6f00",
-        "module": "#a753ae",
-        "tag": "#a753ae",
-        "jsxTag": "#a753ae",
-        "tagAttribute": "#a753ae",
-        "tagAttributeValue": "#00ceb9",
-        "boolean": "#007b80",
-        "decorator": "#a753ae",
-        "label": "#a753ae",
-        "punctuation": "#161210",
-        "macro": "#a753ae",
-        "preprocessor": "#a753ae",
-        "regex": "#161210",
-        "url": "#0445e6",
-        "key": "#a753ae",
-        "exception": "#fc533a"
-      },
-      "highlights": {
-        "diffAdded": "#167517",
-        "diffAddedBackground": "#efffee",
-        "diffRemoved": "#ff8c00",
-        "diffRemovedBackground": "#fef8f6",
-        "diffModified": "#675912",
-        "diffModifiedBackground": "#ebeef4",
-        "lineNumber": "#494644",
-        "lineNumberActive": "#161210"
-      }
-    },
-    "header": {
-      "background": "#f8f8f8",
-      "foreground": "#161210",
-      "border": "#c1c0c0",
-      "icon": "#302c2a",
-      "hover": "#e2e2e2"
-    },
-    "sidebar": {
-      "background": "#ededed",
-      "foreground": "#302c2a",
-      "border": "#c1c0c0",
-      "icon": "#c3c2c1",
-      "hover": "#e2e2e2",
-      "active": "#e0eafd",
-      "accent": "#dcde8d",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#f8f8f8",
-      "userMessage": "#161210",
-      "userMessageBackground": "#ebebeb",
-      "assistantMessage": "#161210",
-      "assistantMessageBackground": "#f8f8f8",
-      "timestamp": "#494644",
-      "divider": "#dcdcdb",
-      "typing": "#302c2a"
-    },
-    "markdown": {
-      "heading1": "#5e5e11",
-      "heading2": "#5e5e11",
-      "heading3": "#070504",
-      "heading4": "#161210",
-      "link": "#0040df",
-      "linkHover": "#8c1896",
-      "inlineCode": "#166c11",
-      "inlineCodeBackground": "#ebebeb",
-      "blockquote": "#675912",
-      "blockquoteBorder": "#c1c0c0",
-      "listMarker": "#0040df99",
-      "bold": "#8c1896",
-      "italic": "#675912",
-      "strikethrough": "#302c2a",
-      "hr": "#c1c0c0"
-    },
-    "tools": {
-      "background": "#ebebeb",
-      "border": "#dcdcdb",
-      "headerHover": "#e2e2e2",
-      "icon": "#c3c2c1",
-      "title": "#161210",
-      "description": "#302c2a",
-      "edit": {
-        "added": "#167517",
-        "addedBackground": "#efffee",
-        "removed": "#fa3012",
-        "removedBackground": "#fef8f6",
-        "modified": "#675912",
-        "modifiedBackground": "#ebeef4",
-        "lineNumber": "#494644"
-      },
-      "bash": {
-        "background": "#f1f1f1",
-        "foreground": "#161210",
-        "info": "#a753ae",
-        "warning": "#ffdc17",
-        "error": "#fc533a"
-      },
-      "lsp": {
-        "background": "#f1f1f1",
-        "foreground": "#161210",
-        "info": "#a753ae",
-        "warning": "#ffdc17",
-        "error": "#fc533a"
-      }
-    },
-    "forms": {
-      "inputBackground": "#f8f8f8",
-      "inputForeground": "#161210",
-      "inputBorder": "#dcdcdb",
-      "inputBorderHover": "#cfcecd",
-      "inputBorderFocus": "#054dfd",
-      "inputPlaceholder": "#494644",
-      "inputDisabled": "#e6e6e6",
-      "inputSelection": "#e0eafd",
-      "label": "#302c2a",
-      "helperText": "#494644"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#dcde8d",
-        "fg": "#000000",
-        "border": "#a3c1fd",
-        "hover": "#d2d369",
-        "active": "#054dfd",
-        "disabled": "#cac9c9"
-      },
-      "secondary": {
-        "bg": "#f1f1f1",
-        "fg": "#161210",
-        "border": "#c1c0c0",
-        "hover": "#ebebeb",
-        "active": "#e2e2e2",
-        "disabled": "#e6e6e6"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#161210",
-        "border": "#00000000",
-        "hover": "#ebebeb",
-        "active": "#e2e2e2",
-        "disabled": "#494644"
-      },
-      "destructive": {
-        "bg": "#fc533a",
-        "fg": "#000000",
-        "border": "#faaa9b",
-        "hover": "#FFF2F0",
-        "active": "#fb543c",
-        "disabled": "#e6e6e6"
-      }
-    },
-    "modal": {
-      "background": "#f1f1f1",
-      "foreground": "#161210",
-      "border": "#c1c0c0",
-      "overlay": "#f8f8f83d"
-    },
-    "popover": {
-      "background": "#f1f1f1",
-      "foreground": "#161210",
-      "border": "#c1c0c0",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f1f1f1",
-      "foreground": "#161210",
-      "border": "#c1c0c0",
-      "inputBackground": "#f8f8f8",
-      "selectedBackground": "#e0eafd",
-      "selectedForeground": "#161210",
-      "muted": "#302c2a"
-    },
-    "fileAttachment": {
-      "background": "#ebebeb",
-      "foreground": "#161210",
-      "border": "#dcdcdb",
-      "icon": "#c3c2c1",
-      "removeHover": "#fde3de"
-    },
-    "sessions": {
-      "background": "#f8f8f8",
-      "foreground": "#161210",
-      "mutedForeground": "#302c2a",
-      "border": "#e5e5e5",
-      "hover": "#e2e2e2",
-      "active": "#e0eafd"
-    },
-    "modelSelector": {
-      "background": "#f1f1f1",
-      "foreground": "#161210",
-      "border": "#c1c0c0",
-      "selectedBackground": "#e0eafd",
-      "selectedForeground": "#161210"
-    },
-    "permissions": {
-      "background": "#f1f1f1",
-      "foreground": "#161210",
-      "border": "#c1c0c0",
-      "allow": "#12c905",
-      "allowBackground": "#bbffb4",
-      "deny": "#fc533a",
-      "denyBackground": "#fde3de"
-    },
-    "loading": {
-      "spinner": "#dcde8d",
-      "spinnerTrack": "#e2e2e2",
-      "skeleton": "#ebebeb",
-      "shimmer": "#e2e2e2"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#16121026",
-      "thumbHover": "#16121040"
-    },
-    "badges": {
-      "default": {
-        "bg": "#ebebeb",
-        "fg": "#161210",
-        "border": "#dcdcdb"
-      },
-      "info": {
-        "bg": "#fcdffe",
-        "fg": "#a753ae",
-        "border": "#f39cf9"
-      },
-      "success": {
-        "bg": "#bbffb4",
-        "fg": "#12c905",
-        "border": "#2ce822"
-      },
-      "warning": {
-        "bg": "#feeb92",
-        "fg": "#ffdc17",
-        "border": "#dec025"
-      },
-      "error": {
-        "bg": "#fde3de",
-        "fg": "#fc533a",
-        "border": "#faaa9b"
-      }
-    },
-    "toast": {
-      "background": "#f1f1f1",
-      "foreground": "#161210",
-      "border": "#c1c0c0",
-      "success": {
-        "background": "#bbffb4",
-        "foreground": "#12c905",
-        "border": "#2ce822"
-      },
-      "warning": {
-        "background": "#feeb92",
-        "foreground": "#ffdc17",
-        "border": "#dec025"
-      },
-      "error": {
-        "background": "#fde3de",
-        "foreground": "#fc533a",
-        "border": "#faaa9b"
-      },
-      "info": {
-        "background": "#fcdffe",
-        "foreground": "#a753ae",
-        "border": "#f39cf9"
-      }
-    },
-    "emptyState": {
-      "icon": "#302c2a",
-      "title": "#161210",
-      "description": "#302c2a",
-      "border": "#e5e5e5"
-    },
-    "table": {
-      "border": "#e5e5e5",
-      "headerBackground": "#f1f1f1",
-      "headerForeground": "#161210",
-      "rowHover": "#e2e2e2",
-      "rowSelected": "#e0eafd"
-    },
-    "charts": {
-      "series": [
-        "#dcde8d",
-        "#a753ae",
-        "#12c905",
-        "#ffdc17",
-        "#fc533a"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#054dfd",
-      "selection": "#e0eafd",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #034cff40"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/onedarkpro-dark.json b/packages/ui/src/lib/theme/themes/onedarkpro-dark.json
index a101eaae..ab114335 100644
--- a/packages/ui/src/lib/theme/themes/onedarkpro-dark.json
+++ b/packages/ui/src/lib/theme/themes/onedarkpro-dark.json
@@ -27,10 +27,10 @@
       "elevated": "#232832",
       "elevatedForeground": "#ABB2BF",
       "overlay": "#F6F7FB20",
-      "subtle": "#2E3442"
+      "subtle": "#272c37"
     },
     "interactive": {
-      "border": "#373e4f",
+      "border": "#313848",
       "borderHover": "#363D52",
       "borderFocus": "#555C79",
       "selection": "#a8aec533",
diff --git a/packages/ui/src/lib/theme/themes/onedarkpro-light.json b/packages/ui/src/lib/theme/themes/onedarkpro-light.json
index b3e09dee..26091e75 100644
--- a/packages/ui/src/lib/theme/themes/onedarkpro-light.json
+++ b/packages/ui/src/lib/theme/themes/onedarkpro-light.json
@@ -27,10 +27,10 @@
       "elevated": "#f0f5fa",
       "elevatedForeground": "#2B303B",
       "overlay": "#0E111820",
-      "subtle": "#eaedf4"
+      "subtle": "#edeff5"
     },
     "interactive": {
-      "border": "#cccfd6",
+      "border": "#d5d8de",
       "borderHover": "#D4D9E3",
       "borderFocus": "#A6ADBF",
       "selection": "#d8dde6",
diff --git a/packages/ui/src/lib/theme/themes/openchamber-dark.json b/packages/ui/src/lib/theme/themes/openchamber-dark.json
new file mode 100644
index 00000000..3e8be4e0
--- /dev/null
+++ b/packages/ui/src/lib/theme/themes/openchamber-dark.json
@@ -0,0 +1,177 @@
+{
+  "metadata": {
+    "id": "openchamber-dark",
+    "name": "OpenChamber",
+    "description": "The OpenChamber signature - Vitesse syntax over OpenCode-deep neutrals with Flexoki accents, harmonized in OKLCH (dark variant)",
+    "author": "OpenChamber",
+    "version": "1.0.0",
+    "variant": "dark",
+    "tags": [
+      "dark",
+      "brand",
+      "hybrid",
+      "warm",
+      "ink"
+    ]
+  },
+  "colors": {
+    "primary": {
+      "base": "#da7c47",
+      "hover": "#eb8c57",
+      "active": "#fd9b66",
+      "foreground": "#000000",
+      "muted": "#da7c4780",
+      "emphasis": "#fd9b66"
+    },
+    "surface": {
+      "background": "#0c0b0a",
+      "foreground": "#dbd7ca",
+      "muted": "#131211",
+      "mutedForeground": "#8f8b81",
+      "elevated": "#181715",
+      "elevatedForeground": "#dbd7ca",
+      "overlay": "#00000099",
+      "subtle": "#171616"
+    },
+    "interactive": {
+      "border": "#242323",
+      "borderHover": "#504e4c",
+      "borderFocus": "#da7c47",
+      "selection": "#da7c472b",
+      "selectionForeground": "#dbd7ca",
+      "focus": "#da7c47",
+      "focusRing": "#da7c4755",
+      "cursor": "#dbd7ca",
+      "hover": "#ffffff12",
+      "active": "#ffffff1f"
+    },
+    "status": {
+      "error": "#da5b4a",
+      "errorForeground": "#000000",
+      "errorBackground": "#da5b4a20",
+      "errorBorder": "#da5b4a50",
+      "warning": "#c67f13",
+      "warningForeground": "#000000",
+      "warningBackground": "#c67f1320",
+      "warningBorder": "#c67f1350",
+      "success": "#76ad4f",
+      "successForeground": "#000000",
+      "successBackground": "#76ad4f20",
+      "successBorder": "#76ad4f50",
+      "info": "#479fe6",
+      "infoForeground": "#000000",
+      "infoBackground": "#479fe620",
+      "infoBorder": "#479fe650"
+    },
+    "pr": {
+      "open": "#93a233",
+      "draft": "#8f8b81",
+      "blocked": "#da7c47",
+      "merged": "#9988e5",
+      "closed": "#da5b4a"
+    },
+    "syntax": {
+      "base": {
+        "background": "#131211",
+        "foreground": "#dbd7ca",
+        "comment": "#728772",
+        "keyword": "#34983a",
+        "string": "#d58373",
+        "number": "#279e93",
+        "function": "#78a952",
+        "variable": "#c69457",
+        "type": "#479cb1",
+        "operator": "#da6b6d"
+      },
+      "tokens": {
+        "commentDoc": "#687b68",
+        "stringEscape": "#dcd7c6",
+        "keywordImport": "#da6b6d",
+        "storageModifier": "#34983a",
+        "functionCall": "#78a952",
+        "method": "#78a952",
+        "variableProperty": "#bda94a",
+        "variableOther": "#c69457",
+        "variableGlobal": "#d58373",
+        "variableLocal": "#201e1c",
+        "parameter": "#dcd7c6",
+        "constant": "#279e93",
+        "class": "#646fba",
+        "className": "#646fba",
+        "interface": "#479cb1",
+        "struct": "#646fba",
+        "enum": "#646fba",
+        "typeParameter": "#479cb1",
+        "namespace": "#479cb1",
+        "module": "#da6b6d",
+        "tag": "#34983a",
+        "jsxTag": "#34983a",
+        "tagAttribute": "#bda94a",
+        "tagAttributeValue": "#d58373",
+        "boolean": "#34983a",
+        "decorator": "#78a952",
+        "label": "#da6b6d",
+        "punctuation": "#908b7e",
+        "macro": "#34983a",
+        "preprocessor": "#da6b6d",
+        "regex": "#d58373",
+        "url": "#d58373",
+        "key": "#bda94a",
+        "exception": "#da6b6d"
+      },
+      "highlights": {
+        "diffAdded": "#4d934e",
+        "diffAddedBackground": "#4d934e20",
+        "diffRemoved": "#cb7676",
+        "diffRemovedBackground": "#cb767620",
+        "diffModified": "#5d99a9",
+        "diffModifiedBackground": "#5d99a920",
+        "lineNumber": "#3c3a37",
+        "lineNumberActive": "#dbd7ca"
+      }
+    },
+    "markdown": {
+      "heading1": "#dbd7ca",
+      "heading2": "#dbd7ca",
+      "heading3": "#dbd7ca",
+      "heading4": "#dbd7ca",
+      "link": "#5d99a9",
+      "linkHover": "#6ba7b8",
+      "inlineCode": "#76ad4f",
+      "inlineCodeBackground": "#211f1d",
+      "blockquote": "#8f8b81",
+      "blockquoteBorder": "#302e2b",
+      "listMarker": "#4d934e99"
+    },
+    "chat": {
+      "userMessage": "#dbd7ca",
+      "userMessageBackground": "#25170e",
+      "assistantMessage": "#dbd7ca",
+      "assistantMessageBackground": "#0c0b0a",
+      "timestamp": "#8f8b81",
+      "divider": "#302e2b"
+    },
+    "tools": {
+      "background": "#13121150",
+      "border": "#302e2b99",
+      "headerHover": "#ffffff0d",
+      "icon": "#ada9a0",
+      "title": "#dbd7ca",
+      "description": "#aba9a3",
+      "edit": {
+        "added": "#4d934e",
+        "addedBackground": "#4d934e25",
+        "removed": "#cb7676",
+        "removedBackground": "#cb767625",
+        "lineNumber": "#3c3a37"
+      }
+    }
+  },
+  "config": {
+    "transitions": {
+      "fast": "150ms ease",
+      "normal": "250ms ease",
+      "slow": "350ms ease"
+    }
+  }
+}
diff --git a/packages/ui/src/lib/theme/themes/openchamber-light.json b/packages/ui/src/lib/theme/themes/openchamber-light.json
new file mode 100644
index 00000000..ec46ddea
--- /dev/null
+++ b/packages/ui/src/lib/theme/themes/openchamber-light.json
@@ -0,0 +1,177 @@
+{
+  "metadata": {
+    "id": "openchamber-light",
+    "name": "OpenChamber",
+    "description": "The OpenChamber signature - Vitesse syntax on warm paper with Flexoki accents, harmonized in OKLCH (light variant)",
+    "author": "OpenChamber",
+    "version": "1.0.0",
+    "variant": "light",
+    "tags": [
+      "light",
+      "brand",
+      "hybrid",
+      "warm",
+      "paper"
+    ]
+  },
+  "colors": {
+    "primary": {
+      "base": "#b35017",
+      "hover": "#9a4310",
+      "active": "#85390c",
+      "foreground": "#ffffff",
+      "muted": "#b3501780",
+      "emphasis": "#9a4310"
+    },
+    "surface": {
+      "background": "#fdfcfa",
+      "foreground": "#393a34",
+      "muted": "#f7f6f4",
+      "mutedForeground": "#5c5c54",
+      "elevated": "#f8f7f5",
+      "elevatedForeground": "#393a34",
+      "overlay": "#39393420",
+      "subtle": "#f7f6f4"
+    },
+    "interactive": {
+      "border": "#e5e1de",
+      "borderHover": "#cbc7c2",
+      "borderFocus": "#b35017",
+      "selection": "#b350172b",
+      "selectionForeground": "#393a34",
+      "focus": "#b35017",
+      "focusRing": "#b3501755",
+      "cursor": "#393a34",
+      "hover": "#0000000d",
+      "active": "#00000014"
+    },
+    "status": {
+      "error": "#b7493f",
+      "errorForeground": "#ffffff",
+      "errorBackground": "#b7493f20",
+      "errorBorder": "#b7493f50",
+      "warning": "#8d6c15",
+      "warningForeground": "#ffffff",
+      "warningBackground": "#8d6c1520",
+      "warningBorder": "#8d6c1550",
+      "success": "#5f8d3d",
+      "successForeground": "#ffffff",
+      "successBackground": "#5f8d3d20",
+      "successBorder": "#5f8d3d50",
+      "info": "#2d72c4",
+      "infoForeground": "#ffffff",
+      "infoBackground": "#2d72c420",
+      "infoBorder": "#2d72c450"
+    },
+    "pr": {
+      "open": "#5f8d3d",
+      "draft": "#6F6E69",
+      "blocked": "#b35017",
+      "merged": "#795cbc",
+      "closed": "#b7493f"
+    },
+    "syntax": {
+      "base": {
+        "background": "#f4f3f1",
+        "foreground": "#393a34",
+        "comment": "#9dae9d",
+        "keyword": "#15764e",
+        "string": "#c25f4b",
+        "number": "#177b8f",
+        "function": "#4e8b18",
+        "variable": "#bb782a",
+        "type": "#0e8294",
+        "operator": "#b94d50"
+      },
+      "tokens": {
+        "commentDoc": "#9dae9d",
+        "stringEscape": "#393a32",
+        "keywordImport": "#b94d50",
+        "storageModifier": "#15764e",
+        "functionCall": "#4e8b18",
+        "method": "#4e8b18",
+        "variableProperty": "#9a8402",
+        "variableOther": "#bb782a",
+        "variableGlobal": "#c25f4b",
+        "variableLocal": "#cfd0c9",
+        "parameter": "#393a32",
+        "constant": "#177b8f",
+        "class": "#5567b6",
+        "className": "#5567b6",
+        "interface": "#0e8294",
+        "struct": "#5567b6",
+        "enum": "#5567b6",
+        "typeParameter": "#0e8294",
+        "namespace": "#0e8294",
+        "module": "#b94d50",
+        "tag": "#15764e",
+        "jsxTag": "#15764e",
+        "tagAttribute": "#9a8402",
+        "tagAttributeValue": "#c25f4b",
+        "boolean": "#15764e",
+        "decorator": "#4e8b18",
+        "label": "#b94d50",
+        "punctuation": "#6b6b61",
+        "macro": "#15764e",
+        "preprocessor": "#b94d50",
+        "regex": "#c25f4b",
+        "url": "#136aad",
+        "key": "#9a8402",
+        "exception": "#b94d50"
+      },
+      "highlights": {
+        "diffAdded": "#2c751e",
+        "diffAddedBackground": "#2c751e20",
+        "diffRemoved": "#ab5959",
+        "diffRemovedBackground": "#ab595920",
+        "diffModified": "#2c751e",
+        "diffModifiedBackground": "#5f8d3d20",
+        "lineNumber": "#b9b6b0",
+        "lineNumberActive": "#393a34"
+      }
+    },
+    "markdown": {
+      "heading1": "#1e754f",
+      "heading2": "#1e754f",
+      "heading3": "#1e754f",
+      "heading4": "#393a34",
+      "link": "#2e808f",
+      "linkHover": "#296aa3",
+      "inlineCode": "#1a8446",
+      "inlineCodeBackground": "#f4f3f1",
+      "blockquote": "#6b6b63",
+      "blockquoteBorder": "#d8d5d0",
+      "listMarker": "#1e754f99"
+    },
+    "chat": {
+      "userMessage": "#393a34",
+      "userMessageBackground": "#fbf4f0",
+      "assistantMessage": "#393a34",
+      "assistantMessageBackground": "#fdfcfa",
+      "timestamp": "#6b6b63",
+      "divider": "#d8d5d0"
+    },
+    "tools": {
+      "background": "#efeeec50",
+      "border": "#d8d5d099",
+      "headerHover": "#0000000d",
+      "icon": "#6b6b63",
+      "title": "#393a34",
+      "description": "#6b6b63",
+      "edit": {
+        "added": "#2c751e",
+        "addedBackground": "#2c751e25",
+        "removed": "#ab5959",
+        "removedBackground": "#ab595925",
+        "lineNumber": "#b9b6b0"
+      }
+    }
+  },
+  "config": {
+    "transitions": {
+      "fast": "150ms ease",
+      "normal": "250ms ease",
+      "slow": "350ms ease"
+    }
+  }
+}
diff --git a/packages/ui/src/lib/theme/themes/orng-dark.json b/packages/ui/src/lib/theme/themes/orng-dark.json
deleted file mode 100644
index 2e4f64c9..00000000
--- a/packages/ui/src/lib/theme/themes/orng-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "orng-dark",
-    "name": "Orng",
-    "description": "Ported from OpenCode Orng theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "orng"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#EC5B2B",
-      "hover": "#da4f1f",
-      "active": "#be3c07",
-      "foreground": "#151313",
-      "muted": "#EC5B2B80",
-      "emphasis": "#fdc4b3"
-    },
-    "surface": {
-      "background": "#050505",
-      "foreground": "#eeeeee",
-      "muted": "#141414",
-      "mutedForeground": "#808080",
-      "elevated": "#0e0e0e",
-      "elevatedForeground": "#eeeeee",
-      "overlay": "#050505cc",
-      "subtle": "#1c1c1c"
-    },
-    "interactive": {
-      "border": "#434343",
-      "borderHover": "#4c4c4c",
-      "borderFocus": "#be3c07",
-      "selection": "#eeeeee1f",
-      "selectionForeground": "#eeeeee",
-      "focus": "#be3c07",
-      "focusRing": "#be3c0761",
-      "cursor": "#fdfdfd",
-      "hover": "#eeeeee17",
-      "active": "#eeeeee1f"
-    },
-    "status": {
-      "error": "#e06c75",
-      "errorForeground": "#151313",
-      "errorBackground": "#5c0318",
-      "errorBorder": "#7c0a25",
-      "warning": "#EC5B2B",
-      "warningForeground": "#151313",
-      "warningBackground": "#531906",
-      "warningBorder": "#752101",
-      "success": "#6ba1e6",
-      "successForeground": "#151313",
-      "successBackground": "#042e5d",
-      "successBorder": "#09417d",
-      "info": "#56b6c2",
-      "infoForeground": "#151313",
-      "infoBackground": "#05363b",
-      "infoBorder": "#0d4b51"
-    },
-    "pr": {
-      "open": "#6ba1e6",
-      "draft": "#808080",
-      "blocked": "#EC5B2B",
-      "merged": "#FFF7F1",
-      "closed": "#e06c75"
-    },
-    "syntax": {
-      "base": {
-        "background": "#0e0e0e",
-        "foreground": "#eeeeee",
-        "comment": "#808080",
-        "keyword": "#EC5B2B",
-        "string": "#6ba1e6",
-        "number": "#FFF7F1",
-        "function": "#56b6c2",
-        "variable": "#e06c75",
-        "type": "#e5c07b",
-        "operator": "#56b6c2"
-      },
-      "tokens": {
-        "commentDoc": "#808080",
-        "stringEscape": "#eeeeee",
-        "keywordImport": "#EC5B2B",
-        "storageModifier": "#EC5B2B",
-        "functionCall": "#56b6c2",
-        "method": "#56b6c2",
-        "variableProperty": "#56b6c2",
-        "variableOther": "#e06c75",
-        "variableGlobal": "#FFF7F1",
-        "variableLocal": "#eeeeee",
-        "parameter": "#e06c75",
-        "constant": "#FFF7F1",
-        "class": "#e5c07b",
-        "className": "#e5c07b",
-        "interface": "#e5c07b",
-        "struct": "#e5c07b",
-        "enum": "#e5c07b",
-        "typeParameter": "#e5c07b",
-        "namespace": "#e5c07b",
-        "module": "#EC5B2B",
-        "tag": "#EC5B2B",
-        "jsxTag": "#EC5B2B",
-        "tagAttribute": "#56b6c2",
-        "tagAttributeValue": "#6ba1e6",
-        "boolean": "#FFF7F1",
-        "decorator": "#EC5B2B",
-        "label": "#56b6c2",
-        "punctuation": "#eeeeee",
-        "macro": "#EC5B2B",
-        "preprocessor": "#EC5B2B",
-        "regex": "#eeeeee",
-        "url": "#fdc4b3",
-        "key": "#56b6c2",
-        "exception": "#e06c75"
-      },
-      "highlights": {
-        "diffAdded": "#b8d6fe",
-        "diffAddedBackground": "#021631",
-        "diffRemoved": "#fec2c4",
-        "diffRemovedBackground": "#30030a",
-        "diffModified": "#ffba92",
-        "diffModifiedBackground": "#150e0c",
-        "lineNumber": "#5d5d5d",
-        "lineNumberActive": "#eeeeee"
-      }
-    },
-    "header": {
-      "background": "#050505",
-      "foreground": "#eeeeee",
-      "border": "#434343",
-      "icon": "#919191",
-      "hover": "#1c1c1c"
-    },
-    "sidebar": {
-      "background": "#0b0b0b",
-      "foreground": "#808080",
-      "border": "#434343",
-      "icon": "#1e1e1e",
-      "hover": "#1c1c1c",
-      "active": "#531906",
-      "accent": "#EC5B2B",
-      "accentForeground": "#151313"
-    },
-    "chat": {
-      "background": "#050505",
-      "userMessage": "#eeeeee",
-      "userMessageBackground": "#141414",
-      "assistantMessage": "#eeeeee",
-      "assistantMessageBackground": "#050505",
-      "timestamp": "#5d5d5d",
-      "divider": "#303030",
-      "typing": "#808080"
-    },
-    "markdown": {
-      "heading1": "#EC5B2B",
-      "heading2": "#EC5B2B",
-      "heading3": "#fdfdfd",
-      "heading4": "#eeeeee",
-      "link": "#EC5B2B",
-      "linkHover": "#56b6c2",
-      "inlineCode": "#6ba1e6",
-      "inlineCodeBackground": "#141414",
-      "blockquote": "#FFF7F1",
-      "blockquoteBorder": "#434343",
-      "listMarker": "#EC5B2B99",
-      "bold": "#EE7948",
-      "italic": "#e5c07b",
-      "strikethrough": "#808080",
-      "hr": "#808080"
-    },
-    "tools": {
-      "background": "#141414",
-      "border": "#303030",
-      "headerHover": "#1c1c1c",
-      "icon": "#1e1e1e",
-      "title": "#eeeeee",
-      "description": "#808080",
-      "edit": {
-        "added": "#b8d6fe",
-        "addedBackground": "#021631",
-        "removed": "#e92b53",
-        "removedBackground": "#30030a",
-        "modified": "#ffba92",
-        "modifiedBackground": "#150e0c",
-        "lineNumber": "#5d5d5d"
-      },
-      "bash": {
-        "background": "#0e0e0e",
-        "foreground": "#eeeeee",
-        "info": "#56b6c2",
-        "warning": "#EC5B2B",
-        "error": "#e06c75"
-      },
-      "lsp": {
-        "background": "#0e0e0e",
-        "foreground": "#eeeeee",
-        "info": "#56b6c2",
-        "warning": "#EC5B2B",
-        "error": "#e06c75"
-      }
-    },
-    "forms": {
-      "inputBackground": "#070707",
-      "inputForeground": "#eeeeee",
-      "inputBorder": "#303030",
-      "inputBorderHover": "#393939",
-      "inputBorderFocus": "#be3c07",
-      "inputPlaceholder": "#5d5d5d",
-      "inputDisabled": "#0f0f0f",
-      "inputSelection": "#9b3108",
-      "label": "#808080",
-      "helperText": "#5d5d5d"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#EC5B2B",
-        "fg": "#151313",
-        "border": "#752101",
-        "hover": "#da4f1f",
-        "active": "#be3c07",
-        "disabled": "#393939"
-      },
-      "secondary": {
-        "bg": "#0e0e0e",
-        "fg": "#eeeeee",
-        "border": "#434343",
-        "hover": "#141414",
-        "active": "#1c1c1c",
-        "disabled": "#0f0f0f"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#eeeeee",
-        "border": "#00000000",
-        "hover": "#141414",
-        "active": "#1c1c1c",
-        "disabled": "#5d5d5d"
-      },
-      "destructive": {
-        "bg": "#e06c75",
-        "fg": "#151313",
-        "border": "#7c0a25",
-        "hover": "#7c0a25",
-        "active": "#ce2245",
-        "disabled": "#0f0f0f"
-      }
-    },
-    "modal": {
-      "background": "#0e0e0e",
-      "foreground": "#eeeeee",
-      "border": "#434343",
-      "overlay": "#050505d6"
-    },
-    "popover": {
-      "background": "#0e0e0e",
-      "foreground": "#eeeeee",
-      "border": "#434343",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#0e0e0e",
-      "foreground": "#eeeeee",
-      "border": "#434343",
-      "inputBackground": "#070707",
-      "selectedBackground": "#531906",
-      "selectedForeground": "#eeeeee",
-      "muted": "#808080"
-    },
-    "fileAttachment": {
-      "background": "#141414",
-      "foreground": "#eeeeee",
-      "border": "#303030",
-      "icon": "#1e1e1e",
-      "removeHover": "#5c0318"
-    },
-    "sessions": {
-      "background": "#050505",
-      "foreground": "#eeeeee",
-      "mutedForeground": "#808080",
-      "border": "#272727",
-      "hover": "#1c1c1c",
-      "active": "#531906"
-    },
-    "modelSelector": {
-      "background": "#0e0e0e",
-      "foreground": "#eeeeee",
-      "border": "#434343",
-      "selectedBackground": "#531906",
-      "selectedForeground": "#eeeeee"
-    },
-    "permissions": {
-      "background": "#0e0e0e",
-      "foreground": "#eeeeee",
-      "border": "#434343",
-      "allow": "#6ba1e6",
-      "allowBackground": "#042e5d",
-      "deny": "#e06c75",
-      "denyBackground": "#5c0318"
-    },
-    "loading": {
-      "spinner": "#EC5B2B",
-      "spinnerTrack": "#1c1c1c",
-      "skeleton": "#141414",
-      "shimmer": "#1c1c1c"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#eeeeee33",
-      "thumbHover": "#eeeeee57"
-    },
-    "badges": {
-      "default": {
-        "bg": "#141414",
-        "fg": "#eeeeee",
-        "border": "#303030"
-      },
-      "info": {
-        "bg": "#05363b",
-        "fg": "#56b6c2",
-        "border": "#0d4b51"
-      },
-      "success": {
-        "bg": "#042e5d",
-        "fg": "#6ba1e6",
-        "border": "#09417d"
-      },
-      "warning": {
-        "bg": "#531906",
-        "fg": "#EC5B2B",
-        "border": "#752101"
-      },
-      "error": {
-        "bg": "#5c0318",
-        "fg": "#e06c75",
-        "border": "#7c0a25"
-      }
-    },
-    "toast": {
-      "background": "#0e0e0e",
-      "foreground": "#eeeeee",
-      "border": "#434343",
-      "success": {
-        "background": "#042e5d",
-        "foreground": "#6ba1e6",
-        "border": "#09417d"
-      },
-      "warning": {
-        "background": "#531906",
-        "foreground": "#EC5B2B",
-        "border": "#752101"
-      },
-      "error": {
-        "background": "#5c0318",
-        "foreground": "#e06c75",
-        "border": "#7c0a25"
-      },
-      "info": {
-        "background": "#05363b",
-        "foreground": "#56b6c2",
-        "border": "#0d4b51"
-      }
-    },
-    "emptyState": {
-      "icon": "#808080",
-      "title": "#eeeeee",
-      "description": "#808080",
-      "border": "#272727"
-    },
-    "table": {
-      "border": "#272727",
-      "headerBackground": "#0e0e0e",
-      "headerForeground": "#eeeeee",
-      "rowHover": "#1c1c1c",
-      "rowSelected": "#531906"
-    },
-    "charts": {
-      "series": [
-        "#EC5B2B",
-        "#56b6c2",
-        "#6ba1e6",
-        "#EC5B2B",
-        "#e06c75"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#be3c07",
-      "selection": "#531906",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #EC5B2B59"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/orng-light.json b/packages/ui/src/lib/theme/themes/orng-light.json
deleted file mode 100644
index f9cd8c53..00000000
--- a/packages/ui/src/lib/theme/themes/orng-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "orng-light",
-    "name": "Orng",
-    "description": "Ported from OpenCode Orng theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "orng"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#EC5B2B",
-      "hover": "#e14d17",
-      "active": "#f45214",
-      "foreground": "#000000",
-      "muted": "#EC5B2B80",
-      "emphasis": "#e14d17"
-    },
-    "surface": {
-      "background": "#ffffff",
-      "foreground": "#181818",
-      "muted": "#f2f2f2",
-      "mutedForeground": "#8a8a8a",
-      "elevated": "#f8f8f8",
-      "elevatedForeground": "#181818",
-      "overlay": "#ffffff33",
-      "subtle": "#e9e9e9"
-    },
-    "interactive": {
-      "border": "#c7c7c7",
-      "borderHover": "#b9b9b9",
-      "borderFocus": "#f45214",
-      "selection": "#18181816",
-      "selectionForeground": "#181818",
-      "focus": "#f45214",
-      "focusRing": "#f4521447",
-      "cursor": "#090909",
-      "hover": "#1818180e",
-      "active": "#18181816"
-    },
-    "status": {
-      "error": "#d1383d",
-      "errorForeground": "#ffffff",
-      "errorBackground": "#fde3e0",
-      "errorBorder": "#faa8a3",
-      "warning": "#EC5B2B",
-      "warningForeground": "#000000",
-      "warningBackground": "#ffe3da",
-      "warningBorder": "#fea88e",
-      "success": "#0062d1",
-      "successForeground": "#ffffff",
-      "successBackground": "#deebfe",
-      "successBorder": "#9ec3fa",
-      "info": "#318795",
-      "infoForeground": "#000000",
-      "infoBackground": "#bff5ff",
-      "infoBorder": "#77d1e1"
-    },
-    "pr": {
-      "open": "#0062d1",
-      "draft": "#8a8a8a",
-      "blocked": "#EC5B2B",
-      "merged": "#EC5B2B",
-      "closed": "#d1383d"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f8f8f8",
-        "foreground": "#181818",
-        "comment": "#8a8a8a",
-        "keyword": "#EC5B2B",
-        "string": "#0062d1",
-        "number": "#EC5B2B",
-        "function": "#318795",
-        "variable": "#d1383d",
-        "type": "#b0851f",
-        "operator": "#318795"
-      },
-      "tokens": {
-        "commentDoc": "#8a8a8a",
-        "stringEscape": "#181818",
-        "keywordImport": "#EC5B2B",
-        "storageModifier": "#EC5B2B",
-        "functionCall": "#318795",
-        "method": "#318795",
-        "variableProperty": "#318795",
-        "variableOther": "#d1383d",
-        "variableGlobal": "#EC5B2B",
-        "variableLocal": "#1a1a1a",
-        "parameter": "#d1383d",
-        "constant": "#EC5B2B",
-        "class": "#b0851f",
-        "className": "#b0851f",
-        "interface": "#b0851f",
-        "struct": "#b0851f",
-        "enum": "#b0851f",
-        "typeParameter": "#b0851f",
-        "namespace": "#b0851f",
-        "module": "#EC5B2B",
-        "tag": "#EC5B2B",
-        "jsxTag": "#EC5B2B",
-        "tagAttribute": "#318795",
-        "tagAttributeValue": "#0062d1",
-        "boolean": "#EC5B2B",
-        "decorator": "#EC5B2B",
-        "label": "#318795",
-        "punctuation": "#1a1a1a",
-        "macro": "#EC5B2B",
-        "preprocessor": "#EC5B2B",
-        "regex": "#181818",
-        "url": "#e14d17",
-        "key": "#318795",
-        "exception": "#d1383d"
-      },
-      "highlights": {
-        "diffAdded": "#2f60a4",
-        "diffAddedBackground": "#f6faff",
-        "diffRemoved": "#ae1a45",
-        "diffRemovedBackground": "#fef7f8",
-        "diffModified": "#FF8C00",
-        "diffModifiedBackground": "#fcf7f5",
-        "lineNumber": "#afafaf",
-        "lineNumberActive": "#181818"
-      }
-    },
-    "header": {
-      "background": "#ffffff",
-      "foreground": "#181818",
-      "border": "#c7c7c7",
-      "icon": "#323232",
-      "hover": "#e9e9e9"
-    },
-    "sidebar": {
-      "background": "#f4f4f4",
-      "foreground": "#8a8a8a",
-      "border": "#c7c7c7",
-      "icon": "#c9c9c9",
-      "hover": "#e9e9e9",
-      "active": "#ffe3da",
-      "accent": "#EC5B2B",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#ffffff",
-      "userMessage": "#181818",
-      "userMessageBackground": "#f2f2f2",
-      "assistantMessage": "#181818",
-      "assistantMessageBackground": "#ffffff",
-      "timestamp": "#afafaf",
-      "divider": "#e3e3e3",
-      "typing": "#8a8a8a"
-    },
-    "markdown": {
-      "heading1": "#EC5B2B",
-      "heading2": "#EC5B2B",
-      "heading3": "#090909",
-      "heading4": "#181818",
-      "link": "#EC5B2B",
-      "linkHover": "#318795",
-      "inlineCode": "#0062d1",
-      "inlineCodeBackground": "#f2f2f2",
-      "blockquote": "#b0851f",
-      "blockquoteBorder": "#c7c7c7",
-      "listMarker": "#EC5B2B99",
-      "bold": "#EC5B2B",
-      "italic": "#b0851f",
-      "strikethrough": "#8a8a8a",
-      "hr": "#8a8a8a"
-    },
-    "tools": {
-      "background": "#f2f2f2",
-      "border": "#e3e3e3",
-      "headerHover": "#e9e9e9",
-      "icon": "#c9c9c9",
-      "title": "#181818",
-      "description": "#8a8a8a",
-      "edit": {
-        "added": "#2f60a4",
-        "addedBackground": "#f6faff",
-        "removed": "#e9055a",
-        "removedBackground": "#fef7f8",
-        "modified": "#FF8C00",
-        "modifiedBackground": "#fcf7f5",
-        "lineNumber": "#afafaf"
-      },
-      "bash": {
-        "background": "#f8f8f8",
-        "foreground": "#181818",
-        "info": "#318795",
-        "warning": "#EC5B2B",
-        "error": "#d1383d"
-      },
-      "lsp": {
-        "background": "#f8f8f8",
-        "foreground": "#181818",
-        "info": "#318795",
-        "warning": "#EC5B2B",
-        "error": "#d1383d"
-      }
-    },
-    "forms": {
-      "inputBackground": "#ffffff",
-      "inputForeground": "#181818",
-      "inputBorder": "#e3e3e3",
-      "inputBorderHover": "#d5d5d5",
-      "inputBorderFocus": "#f45214",
-      "inputPlaceholder": "#afafaf",
-      "inputDisabled": "#ededed",
-      "inputSelection": "#ffe3da",
-      "label": "#8a8a8a",
-      "helperText": "#afafaf"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#EC5B2B",
-        "fg": "#000000",
-        "border": "#fea88e",
-        "hover": "#e14d17",
-        "active": "#f45214",
-        "disabled": "#d0d0d0"
-      },
-      "secondary": {
-        "bg": "#f8f8f8",
-        "fg": "#181818",
-        "border": "#c7c7c7",
-        "hover": "#f2f2f2",
-        "active": "#e9e9e9",
-        "disabled": "#ededed"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#181818",
-        "border": "#00000000",
-        "hover": "#f2f2f2",
-        "active": "#e9e9e9",
-        "disabled": "#afafaf"
-      },
-      "destructive": {
-        "bg": "#d1383d",
-        "fg": "#ffffff",
-        "border": "#faa8a3",
-        "hover": "#fdd5d2",
-        "active": "#e1032b",
-        "disabled": "#ededed"
-      }
-    },
-    "modal": {
-      "background": "#f8f8f8",
-      "foreground": "#181818",
-      "border": "#c7c7c7",
-      "overlay": "#ffffff3d"
-    },
-    "popover": {
-      "background": "#f8f8f8",
-      "foreground": "#181818",
-      "border": "#c7c7c7",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f8f8f8",
-      "foreground": "#181818",
-      "border": "#c7c7c7",
-      "inputBackground": "#ffffff",
-      "selectedBackground": "#ffe3da",
-      "selectedForeground": "#181818",
-      "muted": "#8a8a8a"
-    },
-    "fileAttachment": {
-      "background": "#f2f2f2",
-      "foreground": "#181818",
-      "border": "#e3e3e3",
-      "icon": "#c9c9c9",
-      "removeHover": "#fde3e0"
-    },
-    "sessions": {
-      "background": "#ffffff",
-      "foreground": "#181818",
-      "mutedForeground": "#8a8a8a",
-      "border": "#ececec",
-      "hover": "#e9e9e9",
-      "active": "#ffe3da"
-    },
-    "modelSelector": {
-      "background": "#f8f8f8",
-      "foreground": "#181818",
-      "border": "#c7c7c7",
-      "selectedBackground": "#ffe3da",
-      "selectedForeground": "#181818"
-    },
-    "permissions": {
-      "background": "#f8f8f8",
-      "foreground": "#181818",
-      "border": "#c7c7c7",
-      "allow": "#0062d1",
-      "allowBackground": "#deebfe",
-      "deny": "#d1383d",
-      "denyBackground": "#fde3e0"
-    },
-    "loading": {
-      "spinner": "#EC5B2B",
-      "spinnerTrack": "#e9e9e9",
-      "skeleton": "#f2f2f2",
-      "shimmer": "#e9e9e9"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#18181826",
-      "thumbHover": "#18181840"
-    },
-    "badges": {
-      "default": {
-        "bg": "#f2f2f2",
-        "fg": "#181818",
-        "border": "#e3e3e3"
-      },
-      "info": {
-        "bg": "#bff5ff",
-        "fg": "#318795",
-        "border": "#77d1e1"
-      },
-      "success": {
-        "bg": "#deebfe",
-        "fg": "#0062d1",
-        "border": "#9ec3fa"
-      },
-      "warning": {
-        "bg": "#ffe3da",
-        "fg": "#EC5B2B",
-        "border": "#fea88e"
-      },
-      "error": {
-        "bg": "#fde3e0",
-        "fg": "#d1383d",
-        "border": "#faa8a3"
-      }
-    },
-    "toast": {
-      "background": "#f8f8f8",
-      "foreground": "#181818",
-      "border": "#c7c7c7",
-      "success": {
-        "background": "#deebfe",
-        "foreground": "#0062d1",
-        "border": "#9ec3fa"
-      },
-      "warning": {
-        "background": "#ffe3da",
-        "foreground": "#EC5B2B",
-        "border": "#fea88e"
-      },
-      "error": {
-        "background": "#fde3e0",
-        "foreground": "#d1383d",
-        "border": "#faa8a3"
-      },
-      "info": {
-        "background": "#bff5ff",
-        "foreground": "#318795",
-        "border": "#77d1e1"
-      }
-    },
-    "emptyState": {
-      "icon": "#8a8a8a",
-      "title": "#181818",
-      "description": "#8a8a8a",
-      "border": "#ececec"
-    },
-    "table": {
-      "border": "#ececec",
-      "headerBackground": "#f8f8f8",
-      "headerForeground": "#181818",
-      "rowHover": "#e9e9e9",
-      "rowSelected": "#ffe3da"
-    },
-    "charts": {
-      "series": [
-        "#EC5B2B",
-        "#318795",
-        "#0062d1",
-        "#EC5B2B",
-        "#d1383d"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#f45214",
-      "selection": "#ffe3da",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #EC5B2B40"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/presets.ts b/packages/ui/src/lib/theme/themes/presets.ts
index 9b46b0a2..c2704f90 100644
--- a/packages/ui/src/lib/theme/themes/presets.ts
+++ b/packages/ui/src/lib/theme/themes/presets.ts
@@ -1,8 +1,6 @@
 import type { Theme } from '@/types/theme';
 import { withPrColors } from './prColors';
 
-// import amoled_dark_Raw from './amoled-dark.json';
-// import amoled_light_Raw from './amoled-light.json';
 import aura_dark_Raw from './aura-dark.json';
 import aura_light_Raw from './aura-light.json';
 import ayu_dark_Raw from './ayu-dark.json';
@@ -11,48 +9,30 @@ import carbonfox_dark_Raw from './carbonfox-dark.json';
 import carbonfox_light_Raw from './carbonfox-light.json';
 import catppuccin_dark_Raw from './catppuccin-dark.json';
 import catppuccin_light_Raw from './catppuccin-light.json';
-// import cursor_dark_Raw from './cursor-dark.json';
-// import cursor_light_Raw from './cursor-light.json';
 import dracula_dark_Raw from './dracula-dark.json';
 import dracula_light_Raw from './dracula-light.json';
-// import github_dark_Raw from './github-dark.json';
-// import github_light_Raw from './github-light.json';
 import gruvbox_dark_Raw from './gruvbox-dark.json';
 import gruvbox_light_Raw from './gruvbox-light.json';
 import jetbrains_dark_Raw from './jetbrains-dark.json';
 import jetbrains_light_Raw from './jetbrains-light.json';
 import kanagawa_dark_Raw from './kanagawa-dark.json';
 import kanagawa_light_Raw from './kanagawa-light.json';
-// import lucent_orng_dark_Raw from './lucent-orng-dark.json';
-// import lucent_orng_light_Raw from './lucent-orng-light.json';
 import monokai_dark_Raw from './monokai-dark.json';
 import monokai_light_Raw from './monokai-light.json';
 import nightowl_dark_Raw from './nightowl-dark.json';
 import nightowl_light_Raw from './nightowl-light.json';
 import nord_dark_Raw from './nord-dark.json';
 import nord_light_Raw from './nord-light.json';
-// import oc_2_dark_Raw from './oc-2-dark.json';
-// import oc_2_light_Raw from './oc-2-light.json';
-import openchamber_dark_Raw from './fields-of-the-shire-dark.json';
-import openchamber_light_Raw from './fields-of-the-shire-light.json';
+import fields_of_the_shire_dark_Raw from './fields-of-the-shire-dark.json';
+import fields_of_the_shire_light_Raw from './fields-of-the-shire-light.json';
 import onedarkpro_dark_Raw from './onedarkpro-dark.json';
 import onedarkpro_light_Raw from './onedarkpro-light.json';
-// import orng_dark_Raw from './orng-dark.json';
-// import orng_light_Raw from './orng-light.json';
-// import rosepine_dark_Raw from './rosepine-dark.json';
-// import rosepine_light_Raw from './rosepine-light.json';
-// import shadesofpurple_dark_Raw from './shadesofpurple-dark.json';
-// import shadesofpurple_light_Raw from './shadesofpurple-light.json';
 import solarized_dark_Raw from './solarized-dark.json';
 import solarized_light_Raw from './solarized-light.json';
 import tokyonight_dark_Raw from './tokyonight-dark.json';
 import tokyonight_light_Raw from './tokyonight-light.json';
-// import vercel_dark_Raw from './vercel-dark.json';
-// import vercel_light_Raw from './vercel-light.json';
 import vesper_dark_Raw from './vesper-dark.json';
 import vesper_light_Raw from './vesper-light.json';
-// import zenburn_dark_Raw from './zenburn-dark.json';
-// import zenburn_light_Raw from './zenburn-light.json';
 import mono_plus_dark_Raw from './mono-plus-dark.json';
 import mono_plus_light_Raw from './mono-plus-light.json';
 import mono_dark_Raw from './mono-dark.json';
@@ -61,10 +41,8 @@ import vitesse_dark_dark_Raw from './vitesse-dark-dark.json';
 import vitesse_light_light_Raw from './vitesse-light-light.json';
 
 export const presetThemes: Theme[] = [
-  openchamber_dark_Raw as Theme,
-  openchamber_light_Raw as Theme,
-  // amoled_dark_Raw as Theme,
-  // amoled_light_Raw as Theme,
+  fields_of_the_shire_dark_Raw as Theme,
+  fields_of_the_shire_light_Raw as Theme,
   aura_dark_Raw as Theme,
   aura_light_Raw as Theme,
   ayu_dark_Raw as Theme,
@@ -73,46 +51,28 @@ export const presetThemes: Theme[] = [
   carbonfox_light_Raw as Theme,
   catppuccin_dark_Raw as Theme,
   catppuccin_light_Raw as Theme,
-  // cursor_dark_Raw as Theme,
-  // cursor_light_Raw as Theme,
   dracula_dark_Raw as Theme,
   dracula_light_Raw as Theme,
-  // github_dark_Raw as Theme,
-  // github_light_Raw as Theme,
   gruvbox_dark_Raw as Theme,
   gruvbox_light_Raw as Theme,
   jetbrains_dark_Raw as Theme,
   jetbrains_light_Raw as Theme,
   kanagawa_dark_Raw as Theme,
   kanagawa_light_Raw as Theme,
-  // lucent_orng_dark_Raw as Theme,
-  // lucent_orng_light_Raw as Theme,
   monokai_dark_Raw as Theme,
   monokai_light_Raw as Theme,
   nightowl_dark_Raw as Theme,
   nightowl_light_Raw as Theme,
   nord_dark_Raw as Theme,
   nord_light_Raw as Theme,
-  // oc_2_dark_Raw as Theme,
-  // oc_2_light_Raw as Theme,
   onedarkpro_dark_Raw as Theme,
   onedarkpro_light_Raw as Theme,
-  // orng_dark_Raw as Theme,
-  // orng_light_Raw as Theme,
-  // rosepine_dark_Raw as Theme,
-  // rosepine_light_Raw as Theme,
-  // shadesofpurple_dark_Raw as Theme,
-  // shadesofpurple_light_Raw as Theme,
   solarized_dark_Raw as Theme,
   solarized_light_Raw as Theme,
   tokyonight_dark_Raw as Theme,
   tokyonight_light_Raw as Theme,
-  // vercel_dark_Raw as Theme,
-  // vercel_light_Raw as Theme,
   vesper_dark_Raw as Theme,
   vesper_light_Raw as Theme,
-  // zenburn_dark_Raw as Theme,
-  // zenburn_light_Raw as Theme,
   mono_plus_dark_Raw as Theme,
   mono_plus_light_Raw as Theme,
   mono_dark_Raw as Theme,
diff --git a/packages/ui/src/lib/theme/themes/rosepine-dark.json b/packages/ui/src/lib/theme/themes/rosepine-dark.json
deleted file mode 100644
index d88b3906..00000000
--- a/packages/ui/src/lib/theme/themes/rosepine-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "rosepine-dark",
-    "name": "Rose Pine",
-    "description": "Ported from OpenCode Rose Pine theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "rosepine"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#9ccfd8",
-      "hover": "#5db8c7",
-      "active": "#51a6b4",
-      "foreground": "#000000",
-      "muted": "#9ccfd880",
-      "emphasis": "#8be4f3"
-    },
-    "surface": {
-      "background": "#0c0a16",
-      "foreground": "#e0def5",
-      "muted": "#1a1824",
-      "mutedForeground": "#6e6a86",
-      "elevated": "#14121e",
-      "elevatedForeground": "#e0def5",
-      "overlay": "#0c0a16cc",
-      "subtle": "#211f2c"
-    },
-    "interactive": {
-      "border": "#444251",
-      "borderHover": "#4c4a59",
-      "borderFocus": "#51a6b4",
-      "selection": "#e0def51f",
-      "selectionForeground": "#e0def5",
-      "focus": "#51a6b4",
-      "focusRing": "#51a6b461",
-      "cursor": "#fcfcfe",
-      "hover": "#e0def517",
-      "active": "#e0def51f"
-    },
-    "status": {
-      "error": "#eb6f92",
-      "errorForeground": "#151313",
-      "errorBackground": "#590628",
-      "errorBorder": "#780f39",
-      "warning": "#f6c177",
-      "warningForeground": "#151313",
-      "warningBackground": "#402a06",
-      "warningBorder": "#5a3a01",
-      "success": "#31748f",
-      "successForeground": "#ffffff",
-      "successBackground": "#023446",
-      "successBorder": "#06495f",
-      "info": "#9ccfd8",
-      "infoForeground": "#151313",
-      "infoBackground": "#06353c",
-      "infoBorder": "#0d4a53"
-    },
-    "pr": {
-      "open": "#31748f",
-      "draft": "#6e6a86",
-      "blocked": "#f6c177",
-      "merged": "#c4a7e7",
-      "closed": "#eb6f92"
-    },
-    "syntax": {
-      "base": {
-        "background": "#14121e",
-        "foreground": "#e0def5",
-        "comment": "#6e6a86",
-        "keyword": "#31748f",
-        "string": "#f6c177",
-        "number": "#c4a7e7",
-        "function": "#ebbcba",
-        "variable": "#e0def4",
-        "type": "#9ccfd8",
-        "operator": "#908caa"
-      },
-      "tokens": {
-        "commentDoc": "#6e6a86",
-        "stringEscape": "#e0def5",
-        "keywordImport": "#31748f",
-        "storageModifier": "#31748f",
-        "functionCall": "#ebbcba",
-        "method": "#ebbcba",
-        "variableProperty": "#ebbcba",
-        "variableOther": "#e0def4",
-        "variableGlobal": "#c4a7e7",
-        "variableLocal": "#908caa",
-        "parameter": "#e0def4",
-        "constant": "#c4a7e7",
-        "class": "#9ccfd8",
-        "className": "#9ccfd8",
-        "interface": "#9ccfd8",
-        "struct": "#9ccfd8",
-        "enum": "#9ccfd8",
-        "typeParameter": "#9ccfd8",
-        "namespace": "#9ccfd8",
-        "module": "#31748f",
-        "tag": "#31748f",
-        "jsxTag": "#31748f",
-        "tagAttribute": "#ebbcba",
-        "tagAttributeValue": "#f6c177",
-        "boolean": "#c4a7e7",
-        "decorator": "#31748f",
-        "label": "#ebbcba",
-        "punctuation": "#908caa",
-        "macro": "#31748f",
-        "preprocessor": "#31748f",
-        "regex": "#e0def5",
-        "url": "#8be4f3",
-        "key": "#ebbcba",
-        "exception": "#eb6f92"
-      },
-      "highlights": {
-        "diffAdded": "#9bdffd",
-        "diffAddedBackground": "#021a24",
-        "diffRemoved": "#fec0ce",
-        "diffRemovedBackground": "#300112",
-        "diffModified": "#fdcd8b",
-        "diffModifiedBackground": "#191925",
-        "lineNumber": "#4c4a5d",
-        "lineNumberActive": "#e0def5"
-      }
-    },
-    "header": {
-      "background": "#0c0a16",
-      "foreground": "#e0def5",
-      "border": "#444251",
-      "icon": "#8d8b9e",
-      "hover": "#211f2c"
-    },
-    "sidebar": {
-      "background": "#12101d",
-      "foreground": "#6e6a86",
-      "border": "#444251",
-      "icon": "#242230",
-      "hover": "#211f2c",
-      "active": "#06353c",
-      "accent": "#9ccfd8",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#0c0a16",
-      "userMessage": "#e0def5",
-      "userMessageBackground": "#1a1824",
-      "assistantMessage": "#e0def5",
-      "assistantMessageBackground": "#0c0a16",
-      "timestamp": "#4c4a5d",
-      "divider": "#33313f",
-      "typing": "#6e6a86"
-    },
-    "markdown": {
-      "heading1": "#c4a7e7",
-      "heading2": "#c4a7e7",
-      "heading3": "#fcfcfe",
-      "heading4": "#e0def5",
-      "link": "#9ccfd8",
-      "linkHover": "#ebbcba",
-      "inlineCode": "#31748f",
-      "inlineCodeBackground": "#1a1824",
-      "blockquote": "#6e6a86",
-      "blockquoteBorder": "#444251",
-      "listMarker": "#9ccfd899",
-      "bold": "#eb6f92",
-      "italic": "#f6c177",
-      "strikethrough": "#6e6a86",
-      "hr": "#403d52"
-    },
-    "tools": {
-      "background": "#1a1824",
-      "border": "#33313f",
-      "headerHover": "#211f2c",
-      "icon": "#242230",
-      "title": "#e0def5",
-      "description": "#6e6a86",
-      "edit": {
-        "added": "#9bdffd",
-        "addedBackground": "#021a24",
-        "removed": "#e13474",
-        "removedBackground": "#300112",
-        "modified": "#fdcd8b",
-        "modifiedBackground": "#191925",
-        "lineNumber": "#4c4a5d"
-      },
-      "bash": {
-        "background": "#14121e",
-        "foreground": "#e0def5",
-        "info": "#9ccfd8",
-        "warning": "#f6c177",
-        "error": "#eb6f92"
-      },
-      "lsp": {
-        "background": "#14121e",
-        "foreground": "#e0def5",
-        "info": "#9ccfd8",
-        "warning": "#f6c177",
-        "error": "#eb6f92"
-      }
-    },
-    "forms": {
-      "inputBackground": "#0f0d19",
-      "inputForeground": "#e0def5",
-      "inputBorder": "#33313f",
-      "inputBorderHover": "#3b3948",
-      "inputBorderFocus": "#51a6b4",
-      "inputPlaceholder": "#4c4a5d",
-      "inputDisabled": "#161521",
-      "inputSelection": "#026673",
-      "label": "#6e6a86",
-      "helperText": "#4c4a5d"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#9ccfd8",
-        "fg": "#000000",
-        "border": "#0d4a53",
-        "hover": "#5db8c7",
-        "active": "#51a6b4",
-        "disabled": "#3b3948"
-      },
-      "secondary": {
-        "bg": "#14121e",
-        "fg": "#e0def5",
-        "border": "#444251",
-        "hover": "#1a1824",
-        "active": "#211f2c",
-        "disabled": "#161521"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#e0def5",
-        "border": "#00000000",
-        "hover": "#1a1824",
-        "active": "#211f2c",
-        "disabled": "#4c4a5d"
-      },
-      "destructive": {
-        "bg": "#eb6f92",
-        "fg": "#151313",
-        "border": "#780f39",
-        "hover": "#780f39",
-        "active": "#d81b69",
-        "disabled": "#161521"
-      }
-    },
-    "modal": {
-      "background": "#14121e",
-      "foreground": "#e0def5",
-      "border": "#444251",
-      "overlay": "#0c0a16d6"
-    },
-    "popover": {
-      "background": "#14121e",
-      "foreground": "#e0def5",
-      "border": "#444251",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#14121e",
-      "foreground": "#e0def5",
-      "border": "#444251",
-      "inputBackground": "#0f0d19",
-      "selectedBackground": "#06353c",
-      "selectedForeground": "#e0def5",
-      "muted": "#6e6a86"
-    },
-    "fileAttachment": {
-      "background": "#1a1824",
-      "foreground": "#e0def5",
-      "border": "#33313f",
-      "icon": "#242230",
-      "removeHover": "#590628"
-    },
-    "sessions": {
-      "background": "#0c0a16",
-      "foreground": "#e0def5",
-      "mutedForeground": "#6e6a86",
-      "border": "#2b2936",
-      "hover": "#211f2c",
-      "active": "#06353c"
-    },
-    "modelSelector": {
-      "background": "#14121e",
-      "foreground": "#e0def5",
-      "border": "#444251",
-      "selectedBackground": "#06353c",
-      "selectedForeground": "#e0def5"
-    },
-    "permissions": {
-      "background": "#14121e",
-      "foreground": "#e0def5",
-      "border": "#444251",
-      "allow": "#31748f",
-      "allowBackground": "#023446",
-      "deny": "#eb6f92",
-      "denyBackground": "#590628"
-    },
-    "loading": {
-      "spinner": "#9ccfd8",
-      "spinnerTrack": "#211f2c",
-      "skeleton": "#1a1824",
-      "shimmer": "#211f2c"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#e0def533",
-      "thumbHover": "#e0def557"
-    },
-    "badges": {
-      "default": {
-        "bg": "#1a1824",
-        "fg": "#e0def5",
-        "border": "#33313f"
-      },
-      "info": {
-        "bg": "#06353c",
-        "fg": "#9ccfd8",
-        "border": "#0d4a53"
-      },
-      "success": {
-        "bg": "#023446",
-        "fg": "#31748f",
-        "border": "#06495f"
-      },
-      "warning": {
-        "bg": "#402a06",
-        "fg": "#f6c177",
-        "border": "#5a3a01"
-      },
-      "error": {
-        "bg": "#590628",
-        "fg": "#eb6f92",
-        "border": "#780f39"
-      }
-    },
-    "toast": {
-      "background": "#14121e",
-      "foreground": "#e0def5",
-      "border": "#444251",
-      "success": {
-        "background": "#023446",
-        "foreground": "#31748f",
-        "border": "#06495f"
-      },
-      "warning": {
-        "background": "#402a06",
-        "foreground": "#f6c177",
-        "border": "#5a3a01"
-      },
-      "error": {
-        "background": "#590628",
-        "foreground": "#eb6f92",
-        "border": "#780f39"
-      },
-      "info": {
-        "background": "#06353c",
-        "foreground": "#9ccfd8",
-        "border": "#0d4a53"
-      }
-    },
-    "emptyState": {
-      "icon": "#6e6a86",
-      "title": "#e0def5",
-      "description": "#6e6a86",
-      "border": "#2b2936"
-    },
-    "table": {
-      "border": "#2b2936",
-      "headerBackground": "#14121e",
-      "headerForeground": "#e0def5",
-      "rowHover": "#211f2c",
-      "rowSelected": "#06353c"
-    },
-    "charts": {
-      "series": [
-        "#9ccfd8",
-        "#9ccfd8",
-        "#31748f",
-        "#f6c177",
-        "#eb6f92"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#51a6b4",
-      "selection": "#06353c",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #9ccfd859"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/rosepine-light.json b/packages/ui/src/lib/theme/themes/rosepine-light.json
deleted file mode 100644
index 643d5b86..00000000
--- a/packages/ui/src/lib/theme/themes/rosepine-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "rosepine-light",
-    "name": "Rose Pine",
-    "description": "Ported from OpenCode Rose Pine theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "rosepine"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#31748f",
-      "hover": "#136a89",
-      "active": "#157597",
-      "foreground": "#ffffff",
-      "muted": "#31748f80",
-      "emphasis": "#136a89"
-    },
-    "surface": {
-      "background": "#fbf5ef",
-      "foreground": "#454066",
-      "muted": "#f2ebe8",
-      "mutedForeground": "#9893a5",
-      "elevated": "#f6f0ec",
-      "elevatedForeground": "#454066",
-      "overlay": "#fbf5ef33",
-      "subtle": "#ebe5e3"
-    },
-    "interactive": {
-      "border": "#d3cdd2",
-      "borderHover": "#c9c3cb",
-      "borderFocus": "#157597",
-      "selection": "#45406616",
-      "selectionForeground": "#454066",
-      "focus": "#157597",
-      "focusRing": "#15759747",
-      "cursor": "#332d53",
-      "hover": "#4540660e",
-      "active": "#45406616"
-    },
-    "status": {
-      "error": "#b4637a",
-      "errorForeground": "#000000",
-      "errorBackground": "#fde2e8",
-      "errorBorder": "#faa5bb",
-      "warning": "#ea9d34",
-      "warningForeground": "#000000",
-      "warningBackground": "#fde6cc",
-      "warningBorder": "#fbaf4f",
-      "success": "#286983",
-      "successForeground": "#ffffff",
-      "successBackground": "#d1f0fe",
-      "successBorder": "#86ccec",
-      "info": "#56949f",
-      "infoForeground": "#000000",
-      "infoBackground": "#c8f3fb",
-      "infoBorder": "#89cedb"
-    },
-    "pr": {
-      "open": "#286983",
-      "draft": "#9893a5",
-      "blocked": "#ea9d34",
-      "merged": "#907aa9",
-      "closed": "#b4637a"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f6f0ec",
-        "foreground": "#454066",
-        "comment": "#9893a5",
-        "keyword": "#286983",
-        "string": "#ea9d34",
-        "number": "#907aa9",
-        "function": "#d7827e",
-        "variable": "#575279",
-        "type": "#56949f",
-        "operator": "#797593"
-      },
-      "tokens": {
-        "commentDoc": "#9893a5",
-        "stringEscape": "#454066",
-        "keywordImport": "#286983",
-        "storageModifier": "#286983",
-        "functionCall": "#d7827e",
-        "method": "#d7827e",
-        "variableProperty": "#d7827e",
-        "variableOther": "#575279",
-        "variableGlobal": "#907aa9",
-        "variableLocal": "#797593",
-        "parameter": "#575279",
-        "constant": "#907aa9",
-        "class": "#56949f",
-        "className": "#56949f",
-        "interface": "#56949f",
-        "struct": "#56949f",
-        "enum": "#56949f",
-        "typeParameter": "#56949f",
-        "namespace": "#56949f",
-        "module": "#286983",
-        "tag": "#286983",
-        "jsxTag": "#286983",
-        "tagAttribute": "#d7827e",
-        "tagAttributeValue": "#ea9d34",
-        "boolean": "#907aa9",
-        "decorator": "#286983",
-        "label": "#d7827e",
-        "punctuation": "#797593",
-        "macro": "#286983",
-        "preprocessor": "#286983",
-        "regex": "#454066",
-        "url": "#136a89",
-        "key": "#d7827e",
-        "exception": "#b4637a"
-      },
-      "highlights": {
-        "diffAdded": "#416677",
-        "diffAddedBackground": "#f3fbff",
-        "diffRemoved": "#894a5c",
-        "diffRemovedBackground": "#fff7f9",
-        "diffModified": "#7c4e09",
-        "diffModifiedBackground": "#f0ece8",
-        "lineNumber": "#bdb9c7",
-        "lineNumberActive": "#454066"
-      }
-    },
-    "header": {
-      "background": "#fbf5ef",
-      "foreground": "#454066",
-      "border": "#d3cdd2",
-      "icon": "#635f83",
-      "hover": "#ebe5e3"
-    },
-    "sidebar": {
-      "background": "#f5ede7",
-      "foreground": "#9893a5",
-      "border": "#d3cdd2",
-      "icon": "#e0cfc9",
-      "hover": "#ebe5e3",
-      "active": "#d0f0ff",
-      "accent": "#31748f",
-      "accentForeground": "#ffffff"
-    },
-    "chat": {
-      "background": "#fbf5ef",
-      "userMessage": "#454066",
-      "userMessageBackground": "#f2ebe8",
-      "assistantMessage": "#454066",
-      "assistantMessageBackground": "#fbf5ef",
-      "timestamp": "#bdb9c7",
-      "divider": "#e7e1e0",
-      "typing": "#9893a5"
-    },
-    "markdown": {
-      "heading1": "#907aa9",
-      "heading2": "#907aa9",
-      "heading3": "#332d53",
-      "heading4": "#454066",
-      "link": "#31748f",
-      "linkHover": "#d7827e",
-      "inlineCode": "#286983",
-      "inlineCodeBackground": "#f2ebe8",
-      "blockquote": "#9893a5",
-      "blockquoteBorder": "#d3cdd2",
-      "listMarker": "#31748f99",
-      "bold": "#b4637a",
-      "italic": "#ea9d34",
-      "strikethrough": "#9893a5",
-      "hr": "#dfdad9"
-    },
-    "tools": {
-      "background": "#f2ebe8",
-      "border": "#e7e1e0",
-      "headerHover": "#ebe5e3",
-      "icon": "#e0cfc9",
-      "title": "#454066",
-      "description": "#9893a5",
-      "edit": {
-        "added": "#416677",
-        "addedBackground": "#f3fbff",
-        "removed": "#bd7488",
-        "removedBackground": "#fff7f9",
-        "modified": "#7c4e09",
-        "modifiedBackground": "#f0ece8",
-        "lineNumber": "#bdb9c7"
-      },
-      "bash": {
-        "background": "#f6f0ec",
-        "foreground": "#454066",
-        "info": "#56949f",
-        "warning": "#ea9d34",
-        "error": "#b4637a"
-      },
-      "lsp": {
-        "background": "#f6f0ec",
-        "foreground": "#454066",
-        "info": "#56949f",
-        "warning": "#ea9d34",
-        "error": "#b4637a"
-      }
-    },
-    "forms": {
-      "inputBackground": "#fbf5ef",
-      "inputForeground": "#454066",
-      "inputBorder": "#e7e1e0",
-      "inputBorderHover": "#ddd7d9",
-      "inputBorderFocus": "#157597",
-      "inputPlaceholder": "#bdb9c7",
-      "inputDisabled": "#f2e9e2",
-      "inputSelection": "#d0f0ff",
-      "label": "#9893a5",
-      "helperText": "#bdb9c7"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#31748f",
-        "fg": "#ffffff",
-        "border": "#84cded",
-        "hover": "#136a89",
-        "active": "#157597",
-        "disabled": "#dad4d7"
-      },
-      "secondary": {
-        "bg": "#f6f0ec",
-        "fg": "#454066",
-        "border": "#d3cdd2",
-        "hover": "#f2ebe8",
-        "active": "#ebe5e3",
-        "disabled": "#f2e9e2"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#454066",
-        "border": "#00000000",
-        "hover": "#f2ebe8",
-        "active": "#ebe5e3",
-        "disabled": "#bdb9c7"
-      },
-      "destructive": {
-        "bg": "#b4637a",
-        "fg": "#000000",
-        "border": "#faa5bb",
-        "hover": "#fdd3dd",
-        "active": "#be5b79",
-        "disabled": "#f2e9e2"
-      }
-    },
-    "modal": {
-      "background": "#f6f0ec",
-      "foreground": "#454066",
-      "border": "#d3cdd2",
-      "overlay": "#fbf5ef3d"
-    },
-    "popover": {
-      "background": "#f6f0ec",
-      "foreground": "#454066",
-      "border": "#d3cdd2",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f6f0ec",
-      "foreground": "#454066",
-      "border": "#d3cdd2",
-      "inputBackground": "#fbf5ef",
-      "selectedBackground": "#d0f0ff",
-      "selectedForeground": "#454066",
-      "muted": "#9893a5"
-    },
-    "fileAttachment": {
-      "background": "#f2ebe8",
-      "foreground": "#454066",
-      "border": "#e7e1e0",
-      "icon": "#e0cfc9",
-      "removeHover": "#fde2e8"
-    },
-    "sessions": {
-      "background": "#fbf5ef",
-      "foreground": "#454066",
-      "mutedForeground": "#9893a5",
-      "border": "#ede7e5",
-      "hover": "#ebe5e3",
-      "active": "#d0f0ff"
-    },
-    "modelSelector": {
-      "background": "#f6f0ec",
-      "foreground": "#454066",
-      "border": "#d3cdd2",
-      "selectedBackground": "#d0f0ff",
-      "selectedForeground": "#454066"
-    },
-    "permissions": {
-      "background": "#f6f0ec",
-      "foreground": "#454066",
-      "border": "#d3cdd2",
-      "allow": "#286983",
-      "allowBackground": "#d1f0fe",
-      "deny": "#b4637a",
-      "denyBackground": "#fde2e8"
-    },
-    "loading": {
-      "spinner": "#31748f",
-      "spinnerTrack": "#ebe5e3",
-      "skeleton": "#f2ebe8",
-      "shimmer": "#ebe5e3"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#45406626",
-      "thumbHover": "#45406640"
-    },
-    "badges": {
-      "default": {
-        "bg": "#f2ebe8",
-        "fg": "#454066",
-        "border": "#e7e1e0"
-      },
-      "info": {
-        "bg": "#c8f3fb",
-        "fg": "#56949f",
-        "border": "#89cedb"
-      },
-      "success": {
-        "bg": "#d1f0fe",
-        "fg": "#286983",
-        "border": "#86ccec"
-      },
-      "warning": {
-        "bg": "#fde6cc",
-        "fg": "#ea9d34",
-        "border": "#fbaf4f"
-      },
-      "error": {
-        "bg": "#fde2e8",
-        "fg": "#b4637a",
-        "border": "#faa5bb"
-      }
-    },
-    "toast": {
-      "background": "#f6f0ec",
-      "foreground": "#454066",
-      "border": "#d3cdd2",
-      "success": {
-        "background": "#d1f0fe",
-        "foreground": "#286983",
-        "border": "#86ccec"
-      },
-      "warning": {
-        "background": "#fde6cc",
-        "foreground": "#ea9d34",
-        "border": "#fbaf4f"
-      },
-      "error": {
-        "background": "#fde2e8",
-        "foreground": "#b4637a",
-        "border": "#faa5bb"
-      },
-      "info": {
-        "background": "#c8f3fb",
-        "foreground": "#56949f",
-        "border": "#89cedb"
-      }
-    },
-    "emptyState": {
-      "icon": "#9893a5",
-      "title": "#454066",
-      "description": "#9893a5",
-      "border": "#ede7e5"
-    },
-    "table": {
-      "border": "#ede7e5",
-      "headerBackground": "#f6f0ec",
-      "headerForeground": "#454066",
-      "rowHover": "#ebe5e3",
-      "rowSelected": "#d0f0ff"
-    },
-    "charts": {
-      "series": [
-        "#31748f",
-        "#56949f",
-        "#286983",
-        "#ea9d34",
-        "#b4637a"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#157597",
-      "selection": "#d0f0ff",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #31748f40"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/shadesofpurple-dark.json b/packages/ui/src/lib/theme/themes/shadesofpurple-dark.json
deleted file mode 100644
index 405ffdd8..00000000
--- a/packages/ui/src/lib/theme/themes/shadesofpurple-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "shadesofpurple-dark",
-    "name": "Shades of Purple",
-    "description": "Ported from OpenCode Shades of Purple theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "shadesofpurple"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#c792ff",
-      "hover": "#b569fb",
-      "active": "#ab4afb",
-      "foreground": "#000000",
-      "muted": "#c792ff80",
-      "emphasis": "#dfc8fb"
-    },
-    "surface": {
-      "background": "#0e051d",
-      "foreground": "#f5f0fe",
-      "muted": "#1d142c",
-      "mutedForeground": "#d1ccd8",
-      "elevated": "#170e25",
-      "elevatedForeground": "#f5f0fe",
-      "overlay": "#0e051dcc",
-      "subtle": "#251c33"
-    },
-    "interactive": {
-      "border": "#4b4359",
-      "borderHover": "#544c62",
-      "borderFocus": "#ab4afb",
-      "selection": "#f5f0fe1f",
-      "selectionForeground": "#f5f0fe",
-      "focus": "#ab4afb",
-      "focusRing": "#ab4afb61",
-      "cursor": "#fefeff",
-      "hover": "#f5f0fe17",
-      "active": "#f5f0fe1f"
-    },
-    "status": {
-      "error": "#ff7ac6",
-      "errorForeground": "#151313",
-      "errorBackground": "#55073a",
-      "errorBorder": "#731051",
-      "warning": "#ffd580",
-      "warningForeground": "#151313",
-      "warningBackground": "#3d2c02",
-      "warningBorder": "#543e06",
-      "success": "#7be0b0",
-      "successForeground": "#151313",
-      "successBackground": "#053825",
-      "successBorder": "#0d4e35",
-      "info": "#7dd4ff",
-      "infoForeground": "#151313",
-      "infoBackground": "#003448",
-      "infoBorder": "#034862"
-    },
-    "pr": {
-      "open": "#7be0b0",
-      "draft": "#d1ccd8",
-      "blocked": "#ffd580",
-      "merged": "#ff628c",
-      "closed": "#ff7ac6"
-    },
-    "syntax": {
-      "base": {
-        "background": "#170e25",
-        "foreground": "#f5f0fe",
-        "comment": "#b362ff",
-        "keyword": "#ff9d00",
-        "string": "#a5ff90",
-        "number": "#ff628c",
-        "function": "#9effff",
-        "variable": "#fefeff",
-        "type": "#fad000",
-        "operator": "#d1ccd8"
-      },
-      "tokens": {
-        "commentDoc": "#b362ff",
-        "stringEscape": "#f5f0fe",
-        "keywordImport": "#ff9d00",
-        "storageModifier": "#ff9d00",
-        "functionCall": "#9effff",
-        "method": "#9effff",
-        "variableProperty": "#9effff",
-        "variableOther": "#fefeff",
-        "variableGlobal": "#ff628c",
-        "variableLocal": "#d1ccd8",
-        "parameter": "#fefeff",
-        "constant": "#ff628c",
-        "class": "#fad000",
-        "className": "#fad000",
-        "interface": "#fad000",
-        "struct": "#fad000",
-        "enum": "#fad000",
-        "typeParameter": "#fad000",
-        "namespace": "#fad000",
-        "module": "#ff9d00",
-        "tag": "#ff9d00",
-        "jsxTag": "#ff9d00",
-        "tagAttribute": "#9effff",
-        "tagAttributeValue": "#a5ff90",
-        "boolean": "#ff628c",
-        "decorator": "#ff9d00",
-        "label": "#9effff",
-        "punctuation": "#d1ccd8",
-        "macro": "#ff9d00",
-        "preprocessor": "#ff9d00",
-        "regex": "#f5f0fe",
-        "url": "#dfc8fb",
-        "key": "#9effff",
-        "exception": "#ff7ac6"
-      },
-      "highlights": {
-        "diffAdded": "#24f6c0",
-        "diffAddedBackground": "#021c14",
-        "diffRemoved": "#fdbfdc",
-        "diffRemovedBackground": "#2d031c",
-        "diffModified": "#fee2ad",
-        "diffModifiedBackground": "#1c112c",
-        "lineNumber": "#b4b0ba",
-        "lineNumberActive": "#f5f0fe"
-      }
-    },
-    "header": {
-      "background": "#0e051d",
-      "foreground": "#f5f0fe",
-      "border": "#4b4359",
-      "icon": "#9a93a8",
-      "hover": "#251c33"
-    },
-    "sidebar": {
-      "background": "#150b24",
-      "foreground": "#d1ccd8",
-      "border": "#4b4359",
-      "icon": "#282039",
-      "hover": "#251c33",
-      "active": "#410a67",
-      "accent": "#c792ff",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#0e051d",
-      "userMessage": "#f5f0fe",
-      "userMessageBackground": "#1d142c",
-      "assistantMessage": "#f5f0fe",
-      "assistantMessageBackground": "#0e051d",
-      "timestamp": "#b4b0ba",
-      "divider": "#393047",
-      "typing": "#d1ccd8"
-    },
-    "markdown": {
-      "heading1": "#e7d6fd",
-      "heading2": "#e7d6fd",
-      "heading3": "#fefeff",
-      "heading4": "#f5f0fe",
-      "link": "#e7d6fd",
-      "linkHover": "#bae6fd",
-      "inlineCode": "#77fdc0",
-      "inlineCodeBackground": "#1d142c",
-      "blockquote": "#fee2ad",
-      "blockquoteBorder": "#4b4359",
-      "listMarker": "#e7d6fd99",
-      "bold": "#fcd0e6",
-      "italic": "#fee2ad",
-      "strikethrough": "#d1ccd8",
-      "hr": "#4b4359"
-    },
-    "tools": {
-      "background": "#1d142c",
-      "border": "#393047",
-      "headerHover": "#251c33",
-      "icon": "#282039",
-      "title": "#f5f0fe",
-      "description": "#d1ccd8",
-      "edit": {
-        "added": "#24f6c0",
-        "addedBackground": "#021c14",
-        "removed": "#de299a",
-        "removedBackground": "#2d031c",
-        "modified": "#fee2ad",
-        "modifiedBackground": "#1c112c",
-        "lineNumber": "#b4b0ba"
-      },
-      "bash": {
-        "background": "#170e25",
-        "foreground": "#f5f0fe",
-        "info": "#7dd4ff",
-        "warning": "#ffd580",
-        "error": "#ff7ac6"
-      },
-      "lsp": {
-        "background": "#170e25",
-        "foreground": "#f5f0fe",
-        "info": "#7dd4ff",
-        "warning": "#ffd580",
-        "error": "#ff7ac6"
-      }
-    },
-    "forms": {
-      "inputBackground": "#110820",
-      "inputForeground": "#f5f0fe",
-      "inputBorder": "#393047",
-      "inputBorderHover": "#423a50",
-      "inputBorderFocus": "#ab4afb",
-      "inputPlaceholder": "#b4b0ba",
-      "inputDisabled": "#191029",
-      "inputSelection": "#7b0bc0",
-      "label": "#d1ccd8",
-      "helperText": "#b4b0ba"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#c792ff",
-        "fg": "#000000",
-        "border": "#5c0092",
-        "hover": "#b569fb",
-        "active": "#ab4afb",
-        "disabled": "#423a50"
-      },
-      "secondary": {
-        "bg": "#170e25",
-        "fg": "#f5f0fe",
-        "border": "#4b4359",
-        "hover": "#1d142c",
-        "active": "#251c33",
-        "disabled": "#191029"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#f5f0fe",
-        "border": "#00000000",
-        "hover": "#1d142c",
-        "active": "#251c33",
-        "disabled": "#b4b0ba"
-      },
-      "destructive": {
-        "bg": "#ff7ac6",
-        "fg": "#151313",
-        "border": "#731051",
-        "hover": "#731051",
-        "active": "#e816a4",
-        "disabled": "#191029"
-      }
-    },
-    "modal": {
-      "background": "#170e25",
-      "foreground": "#f5f0fe",
-      "border": "#4b4359",
-      "overlay": "#0e051dd6"
-    },
-    "popover": {
-      "background": "#170e25",
-      "foreground": "#f5f0fe",
-      "border": "#4b4359",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#170e25",
-      "foreground": "#f5f0fe",
-      "border": "#4b4359",
-      "inputBackground": "#110820",
-      "selectedBackground": "#410a67",
-      "selectedForeground": "#f5f0fe",
-      "muted": "#d1ccd8"
-    },
-    "fileAttachment": {
-      "background": "#1d142c",
-      "foreground": "#f5f0fe",
-      "border": "#393047",
-      "icon": "#282039",
-      "removeHover": "#55073a"
-    },
-    "sessions": {
-      "background": "#0e051d",
-      "foreground": "#f5f0fe",
-      "mutedForeground": "#d1ccd8",
-      "border": "#2f273e",
-      "hover": "#251c33",
-      "active": "#410a67"
-    },
-    "modelSelector": {
-      "background": "#170e25",
-      "foreground": "#f5f0fe",
-      "border": "#4b4359",
-      "selectedBackground": "#410a67",
-      "selectedForeground": "#f5f0fe"
-    },
-    "permissions": {
-      "background": "#170e25",
-      "foreground": "#f5f0fe",
-      "border": "#4b4359",
-      "allow": "#7be0b0",
-      "allowBackground": "#053825",
-      "deny": "#ff7ac6",
-      "denyBackground": "#55073a"
-    },
-    "loading": {
-      "spinner": "#c792ff",
-      "spinnerTrack": "#251c33",
-      "skeleton": "#1d142c",
-      "shimmer": "#251c33"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#f5f0fe33",
-      "thumbHover": "#f5f0fe57"
-    },
-    "badges": {
-      "default": {
-        "bg": "#1d142c",
-        "fg": "#f5f0fe",
-        "border": "#393047"
-      },
-      "info": {
-        "bg": "#003448",
-        "fg": "#7dd4ff",
-        "border": "#034862"
-      },
-      "success": {
-        "bg": "#053825",
-        "fg": "#7be0b0",
-        "border": "#0d4e35"
-      },
-      "warning": {
-        "bg": "#3d2c02",
-        "fg": "#ffd580",
-        "border": "#543e06"
-      },
-      "error": {
-        "bg": "#55073a",
-        "fg": "#ff7ac6",
-        "border": "#731051"
-      }
-    },
-    "toast": {
-      "background": "#170e25",
-      "foreground": "#f5f0fe",
-      "border": "#4b4359",
-      "success": {
-        "background": "#053825",
-        "foreground": "#7be0b0",
-        "border": "#0d4e35"
-      },
-      "warning": {
-        "background": "#3d2c02",
-        "foreground": "#ffd580",
-        "border": "#543e06"
-      },
-      "error": {
-        "background": "#55073a",
-        "foreground": "#ff7ac6",
-        "border": "#731051"
-      },
-      "info": {
-        "background": "#003448",
-        "foreground": "#7dd4ff",
-        "border": "#034862"
-      }
-    },
-    "emptyState": {
-      "icon": "#d1ccd8",
-      "title": "#f5f0fe",
-      "description": "#d1ccd8",
-      "border": "#2f273e"
-    },
-    "table": {
-      "border": "#2f273e",
-      "headerBackground": "#170e25",
-      "headerForeground": "#f5f0fe",
-      "rowHover": "#251c33",
-      "rowSelected": "#410a67"
-    },
-    "charts": {
-      "series": [
-        "#c792ff",
-        "#7dd4ff",
-        "#7be0b0",
-        "#ffd580",
-        "#ff7ac6"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#ab4afb",
-      "selection": "#410a67",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #c792ff59"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/shadesofpurple-light.json b/packages/ui/src/lib/theme/themes/shadesofpurple-light.json
deleted file mode 100644
index 266876ab..00000000
--- a/packages/ui/src/lib/theme/themes/shadesofpurple-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "shadesofpurple-light",
-    "name": "Shades of Purple",
-    "description": "Ported from OpenCode Shades of Purple theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "shadesofpurple"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#7a5af8",
-      "hover": "#7242fb",
-      "active": "#7a5bf7",
-      "foreground": "#000000",
-      "muted": "#7a5af880",
-      "emphasis": "#7242fb"
-    },
-    "surface": {
-      "background": "#f8effe",
-      "foreground": "#32224f",
-      "muted": "#ede4f4",
-      "mutedForeground": "#4e406b",
-      "elevated": "#f3e9f9",
-      "elevatedForeground": "#32224f",
-      "overlay": "#f8effe33",
-      "subtle": "#e6dcee"
-    },
-    "interactive": {
-      "border": "#cabfd6",
-      "borderHover": "#bfb4cc",
-      "borderFocus": "#7a5bf7",
-      "selection": "#32224f16",
-      "selectionForeground": "#32224f",
-      "focus": "#7a5bf7",
-      "focusRing": "#7a5bf747",
-      "cursor": "#210f3d",
-      "hover": "#32224f0e",
-      "active": "#32224f16"
-    },
-    "status": {
-      "error": "#ff6bd5",
-      "errorForeground": "#000000",
-      "errorBackground": "#fee0f2",
-      "errorBorder": "#fb9ddd",
-      "warning": "#f7c948",
-      "warningForeground": "#000000",
-      "warningBackground": "#fee8b1",
-      "warningBorder": "#ecba16",
-      "success": "#3dd598",
-      "successForeground": "#000000",
-      "successBackground": "#b0fed6",
-      "successBorder": "#35e29f",
-      "info": "#62d4ff",
-      "infoForeground": "#000000",
-      "infoBackground": "#d0f0fe",
-      "infoBorder": "#63d1fa"
-    },
-    "pr": {
-      "open": "#3dd598",
-      "draft": "#4e406b",
-      "blocked": "#f7c948",
-      "merged": "#e04d7a",
-      "closed": "#ff6bd5"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f3e9f9",
-        "foreground": "#32224f",
-        "comment": "#8e4be3",
-        "keyword": "#c45f00",
-        "string": "#2f8b32",
-        "number": "#e04d7a",
-        "function": "#008fb8",
-        "variable": "#210f3d",
-        "type": "#9d7a00",
-        "operator": "#32224f"
-      },
-      "tokens": {
-        "commentDoc": "#8e4be3",
-        "stringEscape": "#32224f",
-        "keywordImport": "#c45f00",
-        "storageModifier": "#c45f00",
-        "functionCall": "#008fb8",
-        "method": "#008fb8",
-        "variableProperty": "#008fb8",
-        "variableOther": "#210f3d",
-        "variableGlobal": "#e04d7a",
-        "variableLocal": "#32224f",
-        "parameter": "#210f3d",
-        "constant": "#e04d7a",
-        "class": "#9d7a00",
-        "className": "#9d7a00",
-        "interface": "#9d7a00",
-        "struct": "#9d7a00",
-        "enum": "#9d7a00",
-        "typeParameter": "#9d7a00",
-        "namespace": "#9d7a00",
-        "module": "#c45f00",
-        "tag": "#c45f00",
-        "jsxTag": "#c45f00",
-        "tagAttribute": "#008fb8",
-        "tagAttributeValue": "#2f8b32",
-        "boolean": "#e04d7a",
-        "decorator": "#c45f00",
-        "label": "#008fb8",
-        "punctuation": "#32224f",
-        "macro": "#c45f00",
-        "preprocessor": "#c45f00",
-        "regex": "#32224f",
-        "url": "#7242fb",
-        "key": "#008fb8",
-        "exception": "#ff6bd5"
-      },
-      "highlights": {
-        "diffAdded": "#386d50",
-        "diffAddedBackground": "#f2fdf5",
-        "diffRemoved": "#854777",
-        "diffRemovedBackground": "#fff7fc",
-        "diffModified": "#6e560d",
-        "diffModifiedBackground": "#f0e7fa",
-        "lineNumber": "#695e82",
-        "lineNumberActive": "#32224f"
-      }
-    },
-    "header": {
-      "background": "#f8effe",
-      "foreground": "#32224f",
-      "border": "#cabfd6",
-      "icon": "#4e406b",
-      "hover": "#e6dcee"
-    },
-    "sidebar": {
-      "background": "#f0e6f6",
-      "foreground": "#4e406b",
-      "border": "#cabfd6",
-      "icon": "#cec3d9",
-      "hover": "#e6dcee",
-      "active": "#e8e7ff",
-      "accent": "#7a5af8",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#f8effe",
-      "userMessage": "#32224f",
-      "userMessageBackground": "#ede4f4",
-      "assistantMessage": "#32224f",
-      "assistantMessageBackground": "#f8effe",
-      "timestamp": "#695e82",
-      "divider": "#e1d7ea",
-      "typing": "#4e406b"
-    },
-    "markdown": {
-      "heading1": "#5c1adc",
-      "heading2": "#5c1adc",
-      "heading3": "#210f3d",
-      "heading4": "#32224f",
-      "link": "#5c1adc",
-      "linkHover": "#03637f",
-      "inlineCode": "#006b47",
-      "inlineCodeBackground": "#ede4f4",
-      "blockquote": "#6e560d",
-      "blockquoteBorder": "#cabfd6",
-      "listMarker": "#5c1adc99",
-      "bold": "#990d7a",
-      "italic": "#6e560d",
-      "strikethrough": "#4e406b",
-      "hr": "#cabfd6"
-    },
-    "tools": {
-      "background": "#ede4f4",
-      "border": "#e1d7ea",
-      "headerHover": "#e6dcee",
-      "icon": "#cec3d9",
-      "title": "#32224f",
-      "description": "#4e406b",
-      "edit": {
-        "added": "#386d50",
-        "addedBackground": "#f2fdf5",
-        "removed": "#fcb1e9",
-        "removedBackground": "#fff7fc",
-        "modified": "#6e560d",
-        "modifiedBackground": "#f0e7fa",
-        "lineNumber": "#695e82"
-      },
-      "bash": {
-        "background": "#f3e9f9",
-        "foreground": "#32224f",
-        "info": "#62d4ff",
-        "warning": "#f7c948",
-        "error": "#ff6bd5"
-      },
-      "lsp": {
-        "background": "#f3e9f9",
-        "foreground": "#32224f",
-        "info": "#62d4ff",
-        "warning": "#f7c948",
-        "error": "#ff6bd5"
-      }
-    },
-    "forms": {
-      "inputBackground": "#f8effe",
-      "inputForeground": "#32224f",
-      "inputBorder": "#e1d7ea",
-      "inputBorderHover": "#d5cbe0",
-      "inputBorderFocus": "#7a5bf7",
-      "inputPlaceholder": "#695e82",
-      "inputDisabled": "#eae0f2",
-      "inputSelection": "#e8e7ff",
-      "label": "#4e406b",
-      "helperText": "#695e82"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#7a5af8",
-        "fg": "#000000",
-        "border": "#bcb9fb",
-        "hover": "#7242fb",
-        "active": "#7a5bf7",
-        "disabled": "#d1c7dc"
-      },
-      "secondary": {
-        "bg": "#f3e9f9",
-        "fg": "#32224f",
-        "border": "#cabfd6",
-        "hover": "#ede4f4",
-        "active": "#e6dcee",
-        "disabled": "#eae0f2"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#32224f",
-        "border": "#00000000",
-        "hover": "#ede4f4",
-        "active": "#e6dcee",
-        "disabled": "#695e82"
-      },
-      "destructive": {
-        "bg": "#ff6bd5",
-        "fg": "#000000",
-        "border": "#fb9ddd",
-        "hover": "#fed0ed",
-        "active": "#fe6cd5",
-        "disabled": "#eae0f2"
-      }
-    },
-    "modal": {
-      "background": "#f3e9f9",
-      "foreground": "#32224f",
-      "border": "#cabfd6",
-      "overlay": "#f8effe3d"
-    },
-    "popover": {
-      "background": "#f3e9f9",
-      "foreground": "#32224f",
-      "border": "#cabfd6",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f3e9f9",
-      "foreground": "#32224f",
-      "border": "#cabfd6",
-      "inputBackground": "#f8effe",
-      "selectedBackground": "#e8e7ff",
-      "selectedForeground": "#32224f",
-      "muted": "#4e406b"
-    },
-    "fileAttachment": {
-      "background": "#ede4f4",
-      "foreground": "#32224f",
-      "border": "#e1d7ea",
-      "icon": "#cec3d9",
-      "removeHover": "#fee0f2"
-    },
-    "sessions": {
-      "background": "#f8effe",
-      "foreground": "#32224f",
-      "mutedForeground": "#4e406b",
-      "border": "#e8dff0",
-      "hover": "#e6dcee",
-      "active": "#e8e7ff"
-    },
-    "modelSelector": {
-      "background": "#f3e9f9",
-      "foreground": "#32224f",
-      "border": "#cabfd6",
-      "selectedBackground": "#e8e7ff",
-      "selectedForeground": "#32224f"
-    },
-    "permissions": {
-      "background": "#f3e9f9",
-      "foreground": "#32224f",
-      "border": "#cabfd6",
-      "allow": "#3dd598",
-      "allowBackground": "#b0fed6",
-      "deny": "#ff6bd5",
-      "denyBackground": "#fee0f2"
-    },
-    "loading": {
-      "spinner": "#7a5af8",
-      "spinnerTrack": "#e6dcee",
-      "skeleton": "#ede4f4",
-      "shimmer": "#e6dcee"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#32224f26",
-      "thumbHover": "#32224f40"
-    },
-    "badges": {
-      "default": {
-        "bg": "#ede4f4",
-        "fg": "#32224f",
-        "border": "#e1d7ea"
-      },
-      "info": {
-        "bg": "#d0f0fe",
-        "fg": "#62d4ff",
-        "border": "#63d1fa"
-      },
-      "success": {
-        "bg": "#b0fed6",
-        "fg": "#3dd598",
-        "border": "#35e29f"
-      },
-      "warning": {
-        "bg": "#fee8b1",
-        "fg": "#f7c948",
-        "border": "#ecba16"
-      },
-      "error": {
-        "bg": "#fee0f2",
-        "fg": "#ff6bd5",
-        "border": "#fb9ddd"
-      }
-    },
-    "toast": {
-      "background": "#f3e9f9",
-      "foreground": "#32224f",
-      "border": "#cabfd6",
-      "success": {
-        "background": "#b0fed6",
-        "foreground": "#3dd598",
-        "border": "#35e29f"
-      },
-      "warning": {
-        "background": "#fee8b1",
-        "foreground": "#f7c948",
-        "border": "#ecba16"
-      },
-      "error": {
-        "background": "#fee0f2",
-        "foreground": "#ff6bd5",
-        "border": "#fb9ddd"
-      },
-      "info": {
-        "background": "#d0f0fe",
-        "foreground": "#62d4ff",
-        "border": "#63d1fa"
-      }
-    },
-    "emptyState": {
-      "icon": "#4e406b",
-      "title": "#32224f",
-      "description": "#4e406b",
-      "border": "#e8dff0"
-    },
-    "table": {
-      "border": "#e8dff0",
-      "headerBackground": "#f3e9f9",
-      "headerForeground": "#32224f",
-      "rowHover": "#e6dcee",
-      "rowSelected": "#e8e7ff"
-    },
-    "charts": {
-      "series": [
-        "#7a5af8",
-        "#62d4ff",
-        "#3dd598",
-        "#f7c948",
-        "#ff6bd5"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#7a5bf7",
-      "selection": "#e8e7ff",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #7a5af840"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/solarized-dark.json b/packages/ui/src/lib/theme/themes/solarized-dark.json
index 7a572993..36a0eeb6 100644
--- a/packages/ui/src/lib/theme/themes/solarized-dark.json
+++ b/packages/ui/src/lib/theme/themes/solarized-dark.json
@@ -27,10 +27,10 @@
       "elevated": "#052832",
       "elevatedForeground": "#93A1A1",
       "overlay": "#FDF6E320",
-      "subtle": "#042b34"
+      "subtle": "#062930"
     },
     "interactive": {
-      "border": "#253f47",
+      "border": "#223a41",
       "borderHover": "#243E47",
       "borderFocus": "#3A5A6B",
       "selection": "#98afbd33",
diff --git a/packages/ui/src/lib/theme/themes/tokyonight-dark.json b/packages/ui/src/lib/theme/themes/tokyonight-dark.json
index e639c7bd..e3ed162c 100644
--- a/packages/ui/src/lib/theme/themes/tokyonight-dark.json
+++ b/packages/ui/src/lib/theme/themes/tokyonight-dark.json
@@ -23,14 +23,14 @@
       "background": "#0F111A",
       "foreground": "#C0CAF5",
       "muted": "#111428",
-      "mutedForeground": "#6a739d",
+      "mutedForeground": "#8890b3",
       "elevated": "#131629",
       "elevatedForeground": "#C0CAF5",
       "overlay": "#EAEAFF20",
-      "subtle": "#171b30"
+      "subtle": "#15192b"
     },
     "interactive": {
-      "border": "#31344a",
+      "border": "#2d2f43",
       "borderHover": "#292C43",
       "borderFocus": "#45496F",
       "selection": "#b3b3cc33",
@@ -153,7 +153,7 @@
       "headerHover": "#13172A",
       "icon": "#7A88CF",
       "title": "#C0CAF5",
-      "description": "#7A88CF",
+      "description": "#a4adda",
       "edit": {
         "added": "#9ECE6A",
         "addedBackground": "#9ECE6A25",
diff --git a/packages/ui/src/lib/theme/themes/tokyonight-light.json b/packages/ui/src/lib/theme/themes/tokyonight-light.json
index 8c50a90f..ad15fa5e 100644
--- a/packages/ui/src/lib/theme/themes/tokyonight-light.json
+++ b/packages/ui/src/lib/theme/themes/tokyonight-light.json
@@ -30,7 +30,7 @@
       "subtle": "#dadce6"
     },
     "interactive": {
-      "border": "#bbbdc9",
+      "border": "#c7c9d3",
       "borderHover": "#C3C6D2",
       "borderFocus": "#9599A8",
       "selection": "#939cbf47",
diff --git a/packages/ui/src/lib/theme/themes/vercel-dark.json b/packages/ui/src/lib/theme/themes/vercel-dark.json
deleted file mode 100644
index cf961f87..00000000
--- a/packages/ui/src/lib/theme/themes/vercel-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "vercel-dark",
-    "name": "Vercel",
-    "description": "Ported from OpenCode Vercel theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "vercel"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#0070F3",
-      "hover": "#207dfc",
-      "active": "#2280d6",
-      "foreground": "#ffffff",
-      "muted": "#0070F380",
-      "emphasis": "#b6d7fc"
-    },
-    "surface": {
-      "background": "#000000",
-      "foreground": "#ededed",
-      "muted": "#0f0f0f",
-      "mutedForeground": "#878787",
-      "elevated": "#090909",
-      "elevatedForeground": "#ededed",
-      "overlay": "#000000cc",
-      "subtle": "#171717"
-    },
-    "interactive": {
-      "border": "#3f3f3f",
-      "borderHover": "#484848",
-      "borderFocus": "#2280d6",
-      "selection": "#ededed1f",
-      "selectionForeground": "#ededed",
-      "focus": "#2280d6",
-      "focusRing": "#2280d661",
-      "cursor": "#fdfdfd",
-      "hover": "#ededed17",
-      "active": "#ededed1f"
-    },
-    "status": {
-      "error": "#E5484D",
-      "errorForeground": "#151313",
-      "errorBackground": "#5b0710",
-      "errorBorder": "#7b101b",
-      "warning": "#FFB224",
-      "warningForeground": "#151313",
-      "warningBackground": "#412900",
-      "warningBorder": "#593b03",
-      "success": "#46A758",
-      "successForeground": "#151313",
-      "successBackground": "#023a12",
-      "successBorder": "#08501d",
-      "info": "#52A8FF",
-      "infoForeground": "#151313",
-      "infoBackground": "#063056",
-      "infoBorder": "#0e4374"
-    },
-    "pr": {
-      "open": "#46A758",
-      "draft": "#878787",
-      "blocked": "#FFB224",
-      "merged": "#F2A700",
-      "closed": "#E5484D"
-    },
-    "syntax": {
-      "base": {
-        "background": "#090909",
-        "foreground": "#ededed",
-        "comment": "#878787",
-        "keyword": "#F75590",
-        "string": "#63C46D",
-        "number": "#F2A700",
-        "function": "#0AC7AC",
-        "variable": "#52A8FF",
-        "type": "#0AC7AC",
-        "operator": "#F75590"
-      },
-      "tokens": {
-        "commentDoc": "#878787",
-        "stringEscape": "#ededed",
-        "keywordImport": "#F75590",
-        "storageModifier": "#F75590",
-        "functionCall": "#0AC7AC",
-        "method": "#0AC7AC",
-        "variableProperty": "#0AC7AC",
-        "variableOther": "#52A8FF",
-        "variableGlobal": "#F2A700",
-        "variableLocal": "#EDEDED",
-        "parameter": "#52A8FF",
-        "constant": "#F2A700",
-        "class": "#0AC7AC",
-        "className": "#0AC7AC",
-        "interface": "#0AC7AC",
-        "struct": "#0AC7AC",
-        "enum": "#0AC7AC",
-        "typeParameter": "#0AC7AC",
-        "namespace": "#0AC7AC",
-        "module": "#F75590",
-        "tag": "#F75590",
-        "jsxTag": "#F75590",
-        "tagAttribute": "#0AC7AC",
-        "tagAttributeValue": "#63C46D",
-        "boolean": "#F2A700",
-        "decorator": "#F75590",
-        "label": "#0AC7AC",
-        "punctuation": "#EDEDED",
-        "macro": "#F75590",
-        "preprocessor": "#F75590",
-        "regex": "#ededed",
-        "url": "#b6d7fc",
-        "key": "#0AC7AC",
-        "exception": "#E5484D"
-      },
-      "highlights": {
-        "diffAdded": "#38fc61",
-        "diffAddedBackground": "#001d04",
-        "diffRemoved": "#fbc4c1",
-        "diffRemovedBackground": "#310206",
-        "diffModified": "#fdd8a4",
-        "diffModifiedBackground": "#0a0d11",
-        "lineNumber": "#646464",
-        "lineNumberActive": "#ededed"
-      }
-    },
-    "header": {
-      "background": "#000000",
-      "foreground": "#ededed",
-      "border": "#3f3f3f",
-      "icon": "#848484",
-      "hover": "#171717"
-    },
-    "sidebar": {
-      "background": "#000000",
-      "foreground": "#878787",
-      "border": "#3f3f3f",
-      "icon": "#080808",
-      "hover": "#171717",
-      "active": "#063056",
-      "accent": "#0070F3",
-      "accentForeground": "#ffffff"
-    },
-    "chat": {
-      "background": "#000000",
-      "userMessage": "#ededed",
-      "userMessageBackground": "#0f0f0f",
-      "assistantMessage": "#ededed",
-      "assistantMessageBackground": "#000000",
-      "timestamp": "#646464",
-      "divider": "#2c2c2c",
-      "typing": "#878787"
-    },
-    "markdown": {
-      "heading1": "#BF7AF0",
-      "heading2": "#BF7AF0",
-      "heading3": "#fdfdfd",
-      "heading4": "#ededed",
-      "link": "#52A8FF",
-      "linkHover": "#0AC7AC",
-      "inlineCode": "#63C46D",
-      "inlineCodeBackground": "#0f0f0f",
-      "blockquote": "#878787",
-      "blockquoteBorder": "#3f3f3f",
-      "listMarker": "#EDEDED99",
-      "bold": "#F75590",
-      "italic": "#F2A700",
-      "strikethrough": "#878787",
-      "hr": "#454545"
-    },
-    "tools": {
-      "background": "#0f0f0f",
-      "border": "#2c2c2c",
-      "headerHover": "#171717",
-      "icon": "#080808",
-      "title": "#ededed",
-      "description": "#878787",
-      "edit": {
-        "added": "#38fc61",
-        "addedBackground": "#001d04",
-        "removed": "#f22942",
-        "removedBackground": "#310206",
-        "modified": "#fdd8a4",
-        "modifiedBackground": "#0a0d11",
-        "lineNumber": "#646464"
-      },
-      "bash": {
-        "background": "#090909",
-        "foreground": "#ededed",
-        "info": "#52A8FF",
-        "warning": "#FFB224",
-        "error": "#E5484D"
-      },
-      "lsp": {
-        "background": "#090909",
-        "foreground": "#ededed",
-        "info": "#52A8FF",
-        "warning": "#FFB224",
-        "error": "#E5484D"
-      }
-    },
-    "forms": {
-      "inputBackground": "#000000",
-      "inputForeground": "#ededed",
-      "inputBorder": "#2c2c2c",
-      "inputBorderHover": "#353535",
-      "inputBorderFocus": "#2280d6",
-      "inputPlaceholder": "#646464",
-      "inputDisabled": "#010101",
-      "inputSelection": "#065ca1",
-      "label": "#878787",
-      "helperText": "#646464"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#0070F3",
-        "fg": "#ffffff",
-        "border": "#0e4374",
-        "hover": "#207dfc",
-        "active": "#2280d6",
-        "disabled": "#353535"
-      },
-      "secondary": {
-        "bg": "#090909",
-        "fg": "#ededed",
-        "border": "#3f3f3f",
-        "hover": "#0f0f0f",
-        "active": "#171717",
-        "disabled": "#010101"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#ededed",
-        "border": "#00000000",
-        "hover": "#0f0f0f",
-        "active": "#171717",
-        "disabled": "#646464"
-      },
-      "destructive": {
-        "bg": "#E5484D",
-        "fg": "#151313",
-        "border": "#7b101b",
-        "hover": "#7b101b",
-        "active": "#c41e2f",
-        "disabled": "#010101"
-      }
-    },
-    "modal": {
-      "background": "#090909",
-      "foreground": "#ededed",
-      "border": "#3f3f3f",
-      "overlay": "#000000d6"
-    },
-    "popover": {
-      "background": "#090909",
-      "foreground": "#ededed",
-      "border": "#3f3f3f",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#090909",
-      "foreground": "#ededed",
-      "border": "#3f3f3f",
-      "inputBackground": "#000000",
-      "selectedBackground": "#063056",
-      "selectedForeground": "#ededed",
-      "muted": "#878787"
-    },
-    "fileAttachment": {
-      "background": "#0f0f0f",
-      "foreground": "#ededed",
-      "border": "#2c2c2c",
-      "icon": "#080808",
-      "removeHover": "#5b0710"
-    },
-    "sessions": {
-      "background": "#000000",
-      "foreground": "#ededed",
-      "mutedForeground": "#878787",
-      "border": "#222222",
-      "hover": "#171717",
-      "active": "#063056"
-    },
-    "modelSelector": {
-      "background": "#090909",
-      "foreground": "#ededed",
-      "border": "#3f3f3f",
-      "selectedBackground": "#063056",
-      "selectedForeground": "#ededed"
-    },
-    "permissions": {
-      "background": "#090909",
-      "foreground": "#ededed",
-      "border": "#3f3f3f",
-      "allow": "#46A758",
-      "allowBackground": "#023a12",
-      "deny": "#E5484D",
-      "denyBackground": "#5b0710"
-    },
-    "loading": {
-      "spinner": "#0070F3",
-      "spinnerTrack": "#171717",
-      "skeleton": "#0f0f0f",
-      "shimmer": "#171717"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#ededed33",
-      "thumbHover": "#ededed57"
-    },
-    "badges": {
-      "default": {
-        "bg": "#0f0f0f",
-        "fg": "#ededed",
-        "border": "#2c2c2c"
-      },
-      "info": {
-        "bg": "#063056",
-        "fg": "#52A8FF",
-        "border": "#0e4374"
-      },
-      "success": {
-        "bg": "#023a12",
-        "fg": "#46A758",
-        "border": "#08501d"
-      },
-      "warning": {
-        "bg": "#412900",
-        "fg": "#FFB224",
-        "border": "#593b03"
-      },
-      "error": {
-        "bg": "#5b0710",
-        "fg": "#E5484D",
-        "border": "#7b101b"
-      }
-    },
-    "toast": {
-      "background": "#090909",
-      "foreground": "#ededed",
-      "border": "#3f3f3f",
-      "success": {
-        "background": "#023a12",
-        "foreground": "#46A758",
-        "border": "#08501d"
-      },
-      "warning": {
-        "background": "#412900",
-        "foreground": "#FFB224",
-        "border": "#593b03"
-      },
-      "error": {
-        "background": "#5b0710",
-        "foreground": "#E5484D",
-        "border": "#7b101b"
-      },
-      "info": {
-        "background": "#063056",
-        "foreground": "#52A8FF",
-        "border": "#0e4374"
-      }
-    },
-    "emptyState": {
-      "icon": "#878787",
-      "title": "#ededed",
-      "description": "#878787",
-      "border": "#222222"
-    },
-    "table": {
-      "border": "#222222",
-      "headerBackground": "#090909",
-      "headerForeground": "#ededed",
-      "rowHover": "#171717",
-      "rowSelected": "#063056"
-    },
-    "charts": {
-      "series": [
-        "#0070F3",
-        "#52A8FF",
-        "#46A758",
-        "#FFB224",
-        "#E5484D"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#2280d6",
-      "selection": "#063056",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #52A8FF59"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/vercel-light.json b/packages/ui/src/lib/theme/themes/vercel-light.json
deleted file mode 100644
index dc960e6e..00000000
--- a/packages/ui/src/lib/theme/themes/vercel-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "vercel-light",
-    "name": "Vercel",
-    "description": "Ported from OpenCode Vercel theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "vercel"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#0070F3",
-      "hover": "#0767dd",
-      "active": "#0570f2",
-      "foreground": "#000000",
-      "muted": "#0070F380",
-      "emphasis": "#0767dd"
-    },
-    "surface": {
-      "background": "#ffffff",
-      "foreground": "#161616",
-      "muted": "#f1f1f1",
-      "mutedForeground": "#666666",
-      "elevated": "#f8f8f8",
-      "elevatedForeground": "#161616",
-      "overlay": "#ffffff33",
-      "subtle": "#e8e8e8"
-    },
-    "interactive": {
-      "border": "#c6c6c6",
-      "borderHover": "#b8b8b8",
-      "borderFocus": "#0570f2",
-      "selection": "#16161616",
-      "selectionForeground": "#161616",
-      "focus": "#0570f2",
-      "focusRing": "#0570f247",
-      "cursor": "#070707",
-      "hover": "#1616160e",
-      "active": "#16161616"
-    },
-    "status": {
-      "error": "#DC3545",
-      "errorForeground": "#000000",
-      "errorBackground": "#ffe2e1",
-      "errorBorder": "#fea6a4",
-      "warning": "#FF9500",
-      "warningForeground": "#000000",
-      "warningBackground": "#ffe4ce",
-      "warningBorder": "#faaf68",
-      "success": "#388E3C",
-      "successForeground": "#000000",
-      "successBackground": "#c2fcc1",
-      "successBorder": "#7ddb7e",
-      "info": "#0070F3",
-      "infoForeground": "#000000",
-      "infoBackground": "#deebfe",
-      "infoBorder": "#9ec3fb"
-    },
-    "pr": {
-      "open": "#388E3C",
-      "draft": "#666666",
-      "blocked": "#FF9500",
-      "merged": "#FFB224",
-      "closed": "#DC3545"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f8f8f8",
-        "foreground": "#161616",
-        "comment": "#888888",
-        "keyword": "#E93D82",
-        "string": "#46A758",
-        "number": "#FFB224",
-        "function": "#12A594",
-        "variable": "#0070F3",
-        "type": "#12A594",
-        "operator": "#E93D82"
-      },
-      "tokens": {
-        "commentDoc": "#888888",
-        "stringEscape": "#161616",
-        "keywordImport": "#E93D82",
-        "storageModifier": "#E93D82",
-        "functionCall": "#12A594",
-        "method": "#12A594",
-        "variableProperty": "#12A594",
-        "variableOther": "#0070F3",
-        "variableGlobal": "#FFB224",
-        "variableLocal": "#171717",
-        "parameter": "#0070F3",
-        "constant": "#FFB224",
-        "class": "#12A594",
-        "className": "#12A594",
-        "interface": "#12A594",
-        "struct": "#12A594",
-        "enum": "#12A594",
-        "typeParameter": "#12A594",
-        "namespace": "#12A594",
-        "module": "#E93D82",
-        "tag": "#E93D82",
-        "jsxTag": "#E93D82",
-        "tagAttribute": "#12A594",
-        "tagAttributeValue": "#46A758",
-        "boolean": "#FFB224",
-        "decorator": "#E93D82",
-        "label": "#12A594",
-        "punctuation": "#171717",
-        "macro": "#E93D82",
-        "preprocessor": "#E93D82",
-        "regex": "#161616",
-        "url": "#0767dd",
-        "key": "#12A594",
-        "exception": "#DC3545"
-      },
-      "highlights": {
-        "diffAdded": "#0a752b",
-        "diffAddedBackground": "#effff0",
-        "diffRemoved": "#b11829",
-        "diffRemovedBackground": "#fff7f7",
-        "diffModified": "#FF8C00",
-        "diffModifiedBackground": "#f3f6fb",
-        "lineNumber": "#898989",
-        "lineNumberActive": "#161616"
-      }
-    },
-    "header": {
-      "background": "#ffffff",
-      "foreground": "#161616",
-      "border": "#c6c6c6",
-      "icon": "#303030",
-      "hover": "#e8e8e8"
-    },
-    "sidebar": {
-      "background": "#f4f4f4",
-      "foreground": "#666666",
-      "border": "#c6c6c6",
-      "icon": "#c9c9c9",
-      "hover": "#e8e8e8",
-      "active": "#deebfe",
-      "accent": "#0070F3",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#ffffff",
-      "userMessage": "#161616",
-      "userMessageBackground": "#f1f1f1",
-      "assistantMessage": "#161616",
-      "assistantMessageBackground": "#ffffff",
-      "timestamp": "#898989",
-      "divider": "#e2e2e2",
-      "typing": "#666666"
-    },
-    "markdown": {
-      "heading1": "#8E4EC6",
-      "heading2": "#8E4EC6",
-      "heading3": "#070707",
-      "heading4": "#161616",
-      "link": "#0070F3",
-      "linkHover": "#12A594",
-      "inlineCode": "#46A758",
-      "inlineCodeBackground": "#f1f1f1",
-      "blockquote": "#666666",
-      "blockquoteBorder": "#c6c6c6",
-      "listMarker": "#17171799",
-      "bold": "#E93D82",
-      "italic": "#FFB224",
-      "strikethrough": "#666666",
-      "hr": "#999999"
-    },
-    "tools": {
-      "background": "#f1f1f1",
-      "border": "#e2e2e2",
-      "headerHover": "#e8e8e8",
-      "icon": "#c9c9c9",
-      "title": "#161616",
-      "description": "#666666",
-      "edit": {
-        "added": "#0a752b",
-        "addedBackground": "#effff0",
-        "removed": "#e22539",
-        "removedBackground": "#fff7f7",
-        "modified": "#FF8C00",
-        "modifiedBackground": "#f3f6fb",
-        "lineNumber": "#898989"
-      },
-      "bash": {
-        "background": "#f8f8f8",
-        "foreground": "#161616",
-        "info": "#0070F3",
-        "warning": "#FF9500",
-        "error": "#DC3545"
-      },
-      "lsp": {
-        "background": "#f8f8f8",
-        "foreground": "#161616",
-        "info": "#0070F3",
-        "warning": "#FF9500",
-        "error": "#DC3545"
-      }
-    },
-    "forms": {
-      "inputBackground": "#ffffff",
-      "inputForeground": "#161616",
-      "inputBorder": "#e2e2e2",
-      "inputBorderHover": "#d4d4d4",
-      "inputBorderFocus": "#0570f2",
-      "inputPlaceholder": "#898989",
-      "inputDisabled": "#ededed",
-      "inputSelection": "#deebfe",
-      "label": "#666666",
-      "helperText": "#898989"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#0070F3",
-        "fg": "#000000",
-        "border": "#9ec3fb",
-        "hover": "#0767dd",
-        "active": "#0570f2",
-        "disabled": "#d0d0d0"
-      },
-      "secondary": {
-        "bg": "#f8f8f8",
-        "fg": "#161616",
-        "border": "#c6c6c6",
-        "hover": "#f1f1f1",
-        "active": "#e8e8e8",
-        "disabled": "#ededed"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#161616",
-        "border": "#00000000",
-        "hover": "#f1f1f1",
-        "active": "#e8e8e8",
-        "disabled": "#898989"
-      },
-      "destructive": {
-        "bg": "#DC3545",
-        "fg": "#000000",
-        "border": "#fea6a4",
-        "hover": "#ffd4d2",
-        "active": "#e4223e",
-        "disabled": "#ededed"
-      }
-    },
-    "modal": {
-      "background": "#f8f8f8",
-      "foreground": "#161616",
-      "border": "#c6c6c6",
-      "overlay": "#ffffff3d"
-    },
-    "popover": {
-      "background": "#f8f8f8",
-      "foreground": "#161616",
-      "border": "#c6c6c6",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f8f8f8",
-      "foreground": "#161616",
-      "border": "#c6c6c6",
-      "inputBackground": "#ffffff",
-      "selectedBackground": "#deebfe",
-      "selectedForeground": "#161616",
-      "muted": "#666666"
-    },
-    "fileAttachment": {
-      "background": "#f1f1f1",
-      "foreground": "#161616",
-      "border": "#e2e2e2",
-      "icon": "#c9c9c9",
-      "removeHover": "#ffe2e1"
-    },
-    "sessions": {
-      "background": "#ffffff",
-      "foreground": "#161616",
-      "mutedForeground": "#666666",
-      "border": "#ececec",
-      "hover": "#e8e8e8",
-      "active": "#deebfe"
-    },
-    "modelSelector": {
-      "background": "#f8f8f8",
-      "foreground": "#161616",
-      "border": "#c6c6c6",
-      "selectedBackground": "#deebfe",
-      "selectedForeground": "#161616"
-    },
-    "permissions": {
-      "background": "#f8f8f8",
-      "foreground": "#161616",
-      "border": "#c6c6c6",
-      "allow": "#388E3C",
-      "allowBackground": "#c2fcc1",
-      "deny": "#DC3545",
-      "denyBackground": "#ffe2e1"
-    },
-    "loading": {
-      "spinner": "#0070F3",
-      "spinnerTrack": "#e8e8e8",
-      "skeleton": "#f1f1f1",
-      "shimmer": "#e8e8e8"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#16161626",
-      "thumbHover": "#16161640"
-    },
-    "badges": {
-      "default": {
-        "bg": "#f1f1f1",
-        "fg": "#161616",
-        "border": "#e2e2e2"
-      },
-      "info": {
-        "bg": "#deebfe",
-        "fg": "#0070F3",
-        "border": "#9ec3fb"
-      },
-      "success": {
-        "bg": "#c2fcc1",
-        "fg": "#388E3C",
-        "border": "#7ddb7e"
-      },
-      "warning": {
-        "bg": "#ffe4ce",
-        "fg": "#FF9500",
-        "border": "#faaf68"
-      },
-      "error": {
-        "bg": "#ffe2e1",
-        "fg": "#DC3545",
-        "border": "#fea6a4"
-      }
-    },
-    "toast": {
-      "background": "#f8f8f8",
-      "foreground": "#161616",
-      "border": "#c6c6c6",
-      "success": {
-        "background": "#c2fcc1",
-        "foreground": "#388E3C",
-        "border": "#7ddb7e"
-      },
-      "warning": {
-        "background": "#ffe4ce",
-        "foreground": "#FF9500",
-        "border": "#faaf68"
-      },
-      "error": {
-        "background": "#ffe2e1",
-        "foreground": "#DC3545",
-        "border": "#fea6a4"
-      },
-      "info": {
-        "background": "#deebfe",
-        "foreground": "#0070F3",
-        "border": "#9ec3fb"
-      }
-    },
-    "emptyState": {
-      "icon": "#666666",
-      "title": "#161616",
-      "description": "#666666",
-      "border": "#ececec"
-    },
-    "table": {
-      "border": "#ececec",
-      "headerBackground": "#f8f8f8",
-      "headerForeground": "#161616",
-      "rowHover": "#e8e8e8",
-      "rowSelected": "#deebfe"
-    },
-    "charts": {
-      "series": [
-        "#0070F3",
-        "#0070F3",
-        "#388E3C",
-        "#FF9500",
-        "#DC3545"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#0570f2",
-      "selection": "#deebfe",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #0070F340"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/vesper-dark.json b/packages/ui/src/lib/theme/themes/vesper-dark.json
index b0383397..cdfb6c29 100644
--- a/packages/ui/src/lib/theme/themes/vesper-dark.json
+++ b/packages/ui/src/lib/theme/themes/vesper-dark.json
@@ -27,10 +27,10 @@
       "elevated": "#242121",
       "elevatedForeground": "#FFFFFF",
       "overlay": "#FFFFFF20",
-      "subtle": "#232323"
+      "subtle": "#1f1f1f"
     },
     "interactive": {
-      "border": "#494949",
+      "border": "#373636",
       "borderHover": "#202020",
       "borderFocus": "#383838",
       "selection": "#b1adad33",
diff --git a/packages/ui/src/lib/theme/themes/vesper-light.json b/packages/ui/src/lib/theme/themes/vesper-light.json
index b3f9882c..7da20110 100644
--- a/packages/ui/src/lib/theme/themes/vesper-light.json
+++ b/packages/ui/src/lib/theme/themes/vesper-light.json
@@ -27,10 +27,10 @@
       "elevated": "#f6f5f5",
       "elevatedForeground": "#101010",
       "overlay": "#00000020",
-      "subtle": "#f5f3f3"
+      "subtle": "#f6f2f2"
     },
     "interactive": {
-      "border": "#d0cece",
+      "border": "#dfdada",
       "borderHover": "#E0E0E0",
       "borderFocus": "#9e9e9e",
       "selection": "#5e5b5b22",
diff --git a/packages/ui/src/lib/theme/themes/vitesse-dark-dark.json b/packages/ui/src/lib/theme/themes/vitesse-dark-dark.json
index 0c481b9f..cfaf630f 100644
--- a/packages/ui/src/lib/theme/themes/vitesse-dark-dark.json
+++ b/packages/ui/src/lib/theme/themes/vitesse-dark-dark.json
@@ -28,10 +28,10 @@
       "elevated": "#1a1a1a",
       "elevatedForeground": "#dbd7caee",
       "overlay": "#12121280",
-      "subtle": "#212020"
+      "subtle": "#1e1e1e"
     },
     "interactive": {
-      "border": "#393939",
+      "border": "#313131",
       "borderHover": "#3c3c3c",
       "borderFocus": "#00000000",
       "selection": "#eeeeee18",
@@ -133,7 +133,7 @@
       "headerHover": "#ffffff1550",
       "icon": "#dedcd5a4",
       "title": "#dbd7caee",
-      "description": "#dedcd550",
+      "description": "#e9e8e27f",
       "edit": {
         "added": "#4d9375",
         "addedBackground": "#4d937520",
diff --git a/packages/ui/src/lib/theme/themes/vitesse-light-light.json b/packages/ui/src/lib/theme/themes/vitesse-light-light.json
index 2efa19cd..906e4811 100644
--- a/packages/ui/src/lib/theme/themes/vitesse-light-light.json
+++ b/packages/ui/src/lib/theme/themes/vitesse-light-light.json
@@ -23,15 +23,15 @@
     "surface": {
       "background": "#ffffff",
       "foreground": "#2c2c28",
-      "muted": "#ecebeb",
+      "muted": "#f2f0f0",
       "mutedForeground": "#5b5c54cb",
       "elevated": "#f7f7f7",
       "elevatedForeground": "#393a34",
       "overlay": "#ffffff80",
-      "subtle": "#ecebeb"
+      "subtle": "#f6f3f3"
     },
     "interactive": {
-      "border": "#d4d0d0",
+      "border": "#dbd8d8",
       "borderHover": "#cbc7c7",
       "borderFocus": "#635454b8",
       "selection": "#22222218",
diff --git a/packages/ui/src/lib/theme/themes/zenburn-dark.json b/packages/ui/src/lib/theme/themes/zenburn-dark.json
deleted file mode 100644
index 76872d9b..00000000
--- a/packages/ui/src/lib/theme/themes/zenburn-dark.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "zenburn-dark",
-    "name": "Zenburn",
-    "description": "Ported from OpenCode Zenburn theme (dark variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "dark",
-    "tags": [
-      "dark",
-      "opencode",
-      "ported",
-      "zenburn"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#8cd0d3",
-      "hover": "#31bbc1",
-      "active": "#24a9af",
-      "foreground": "#000000",
-      "muted": "#8cd0d380",
-      "emphasis": "#6deaf0"
-    },
-    "surface": {
-      "background": "#262626",
-      "foreground": "#dcdccb",
-      "muted": "#323231",
-      "mutedForeground": "#9f9f9f",
-      "elevated": "#2d2d2c",
-      "elevatedForeground": "#dcdccb",
-      "overlay": "#262626cc",
-      "subtle": "#383836"
-    },
-    "interactive": {
-      "border": "#565652",
-      "borderHover": "#5d5d58",
-      "borderFocus": "#24a9af",
-      "selection": "#dcdccb1f",
-      "selectionForeground": "#dcdccb",
-      "focus": "#24a9af",
-      "focusRing": "#24a9af61",
-      "cursor": "#fcfcfa",
-      "hover": "#dcdccb17",
-      "active": "#dcdccb1f"
-    },
-    "status": {
-      "error": "#cc9393",
-      "errorForeground": "#151313",
-      "errorBackground": "#52181d",
-      "errorBorder": "#6b292d",
-      "warning": "#f0dfaf",
-      "warningForeground": "#151313",
-      "warningBackground": "#3a2d04",
-      "warningBorder": "#504009",
-      "success": "#7f9f7f",
-      "successForeground": "#151313",
-      "successBackground": "#133816",
-      "successBorder": "#234d26",
-      "info": "#dfaf8f",
-      "infoForeground": "#151313",
-      "infoBackground": "#492303",
-      "infoBorder": "#643309"
-    },
-    "pr": {
-      "open": "#7f9f7f",
-      "draft": "#9f9f9f",
-      "blocked": "#f0dfaf",
-      "merged": "#8fb28f",
-      "closed": "#cc9393"
-    },
-    "syntax": {
-      "base": {
-        "background": "#2d2d2c",
-        "foreground": "#dcdccb",
-        "comment": "#7f9f7f",
-        "keyword": "#f0dfaf",
-        "string": "#cc9393",
-        "number": "#8fb28f",
-        "function": "#93e0e3",
-        "variable": "#dcdccc",
-        "type": "#93e0e3",
-        "operator": "#f0dfaf"
-      },
-      "tokens": {
-        "commentDoc": "#7f9f7f",
-        "stringEscape": "#dcdccb",
-        "keywordImport": "#f0dfaf",
-        "storageModifier": "#f0dfaf",
-        "functionCall": "#93e0e3",
-        "method": "#93e0e3",
-        "variableProperty": "#93e0e3",
-        "variableOther": "#dcdccc",
-        "variableGlobal": "#8fb28f",
-        "variableLocal": "#dcdccc",
-        "parameter": "#dcdccc",
-        "constant": "#8fb28f",
-        "class": "#93e0e3",
-        "className": "#93e0e3",
-        "interface": "#93e0e3",
-        "struct": "#93e0e3",
-        "enum": "#93e0e3",
-        "typeParameter": "#93e0e3",
-        "namespace": "#93e0e3",
-        "module": "#f0dfaf",
-        "tag": "#f0dfaf",
-        "jsxTag": "#f0dfaf",
-        "tagAttribute": "#93e0e3",
-        "tagAttributeValue": "#cc9393",
-        "boolean": "#8fb28f",
-        "decorator": "#f0dfaf",
-        "label": "#93e0e3",
-        "punctuation": "#dcdccc",
-        "macro": "#f0dfaf",
-        "preprocessor": "#f0dfaf",
-        "regex": "#dcdccb",
-        "url": "#6deaf0",
-        "key": "#93e0e3",
-        "exception": "#cc9393"
-      },
-      "highlights": {
-        "diffAdded": "#aae6aa",
-        "diffAddedBackground": "#021d05",
-        "diffRemoved": "#fcc3c3",
-        "diffRemovedBackground": "#2f0409",
-        "diffModified": "#fdeab3",
-        "diffModifiedBackground": "#303333",
-        "lineNumber": "#7b7b7b",
-        "lineNumberActive": "#dcdccb"
-      }
-    },
-    "header": {
-      "background": "#262626",
-      "foreground": "#dcdccb",
-      "border": "#565652",
-      "icon": "#97968d",
-      "hover": "#383836"
-    },
-    "sidebar": {
-      "background": "#2c2c2b",
-      "foreground": "#9f9f9f",
-      "border": "#565652",
-      "icon": "#3d3c3b",
-      "hover": "#383836",
-      "active": "#033638",
-      "accent": "#8cd0d3",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#262626",
-      "userMessage": "#dcdccb",
-      "userMessageBackground": "#323231",
-      "assistantMessage": "#dcdccb",
-      "assistantMessageBackground": "#262626",
-      "timestamp": "#7b7b7b",
-      "divider": "#474745",
-      "typing": "#9f9f9f"
-    },
-    "markdown": {
-      "heading1": "#f0dfaf",
-      "heading2": "#f0dfaf",
-      "heading3": "#fcfcfa",
-      "heading4": "#dcdccb",
-      "link": "#8cd0d3",
-      "linkHover": "#93e0e3",
-      "inlineCode": "#7f9f7f",
-      "inlineCodeBackground": "#323231",
-      "blockquote": "#9f9f9f",
-      "blockquoteBorder": "#565652",
-      "listMarker": "#8cd0d399",
-      "bold": "#dfaf8f",
-      "italic": "#e0cf9f",
-      "strikethrough": "#9f9f9f",
-      "hr": "#9f9f9f"
-    },
-    "tools": {
-      "background": "#323231",
-      "border": "#474745",
-      "headerHover": "#383836",
-      "icon": "#3d3c3b",
-      "title": "#dcdccb",
-      "description": "#9f9f9f",
-      "edit": {
-        "added": "#aae6aa",
-        "addedBackground": "#021d05",
-        "removed": "#d67c7e",
-        "removedBackground": "#2f0409",
-        "modified": "#fdeab3",
-        "modifiedBackground": "#303333",
-        "lineNumber": "#7b7b7b"
-      },
-      "bash": {
-        "background": "#2d2d2c",
-        "foreground": "#dcdccb",
-        "info": "#dfaf8f",
-        "warning": "#f0dfaf",
-        "error": "#cc9393"
-      },
-      "lsp": {
-        "background": "#2d2d2c",
-        "foreground": "#dcdccb",
-        "info": "#dfaf8f",
-        "warning": "#f0dfaf",
-        "error": "#cc9393"
-      }
-    },
-    "forms": {
-      "inputBackground": "#292929",
-      "inputForeground": "#dcdccb",
-      "inputBorder": "#474745",
-      "inputBorderHover": "#4f4f4b",
-      "inputBorderFocus": "#24a9af",
-      "inputPlaceholder": "#7b7b7b",
-      "inputDisabled": "#30302f",
-      "inputSelection": "#14676a",
-      "label": "#9f9f9f",
-      "helperText": "#7b7b7b"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#8cd0d3",
-        "fg": "#000000",
-        "border": "#084b4e",
-        "hover": "#31bbc1",
-        "active": "#24a9af",
-        "disabled": "#4f4f4b"
-      },
-      "secondary": {
-        "bg": "#2d2d2c",
-        "fg": "#dcdccb",
-        "border": "#565652",
-        "hover": "#323231",
-        "active": "#383836",
-        "disabled": "#30302f"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#dcdccb",
-        "border": "#00000000",
-        "hover": "#323231",
-        "active": "#383836",
-        "disabled": "#7b7b7b"
-      },
-      "destructive": {
-        "bg": "#cc9393",
-        "fg": "#151313",
-        "border": "#6b292d",
-        "hover": "#6b292d",
-        "active": "#b56264",
-        "disabled": "#30302f"
-      }
-    },
-    "modal": {
-      "background": "#2d2d2c",
-      "foreground": "#dcdccb",
-      "border": "#565652",
-      "overlay": "#262626d6"
-    },
-    "popover": {
-      "background": "#2d2d2c",
-      "foreground": "#dcdccb",
-      "border": "#565652",
-      "shadow": "0 18px 48px rgba(0, 0, 0, 0.45)"
-    },
-    "commandPalette": {
-      "background": "#2d2d2c",
-      "foreground": "#dcdccb",
-      "border": "#565652",
-      "inputBackground": "#292929",
-      "selectedBackground": "#033638",
-      "selectedForeground": "#dcdccb",
-      "muted": "#9f9f9f"
-    },
-    "fileAttachment": {
-      "background": "#323231",
-      "foreground": "#dcdccb",
-      "border": "#474745",
-      "icon": "#3d3c3b",
-      "removeHover": "#52181d"
-    },
-    "sessions": {
-      "background": "#262626",
-      "foreground": "#dcdccb",
-      "mutedForeground": "#9f9f9f",
-      "border": "#40403e",
-      "hover": "#383836",
-      "active": "#033638"
-    },
-    "modelSelector": {
-      "background": "#2d2d2c",
-      "foreground": "#dcdccb",
-      "border": "#565652",
-      "selectedBackground": "#033638",
-      "selectedForeground": "#dcdccb"
-    },
-    "permissions": {
-      "background": "#2d2d2c",
-      "foreground": "#dcdccb",
-      "border": "#565652",
-      "allow": "#7f9f7f",
-      "allowBackground": "#133816",
-      "deny": "#cc9393",
-      "denyBackground": "#52181d"
-    },
-    "loading": {
-      "spinner": "#8cd0d3",
-      "spinnerTrack": "#383836",
-      "skeleton": "#323231",
-      "shimmer": "#383836"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#dcdccb33",
-      "thumbHover": "#dcdccb57"
-    },
-    "badges": {
-      "default": {
-        "bg": "#323231",
-        "fg": "#dcdccb",
-        "border": "#474745"
-      },
-      "info": {
-        "bg": "#492303",
-        "fg": "#dfaf8f",
-        "border": "#643309"
-      },
-      "success": {
-        "bg": "#133816",
-        "fg": "#7f9f7f",
-        "border": "#234d26"
-      },
-      "warning": {
-        "bg": "#3a2d04",
-        "fg": "#f0dfaf",
-        "border": "#504009"
-      },
-      "error": {
-        "bg": "#52181d",
-        "fg": "#cc9393",
-        "border": "#6b292d"
-      }
-    },
-    "toast": {
-      "background": "#2d2d2c",
-      "foreground": "#dcdccb",
-      "border": "#565652",
-      "success": {
-        "background": "#133816",
-        "foreground": "#7f9f7f",
-        "border": "#234d26"
-      },
-      "warning": {
-        "background": "#3a2d04",
-        "foreground": "#f0dfaf",
-        "border": "#504009"
-      },
-      "error": {
-        "background": "#52181d",
-        "foreground": "#cc9393",
-        "border": "#6b292d"
-      },
-      "info": {
-        "background": "#492303",
-        "foreground": "#dfaf8f",
-        "border": "#643309"
-      }
-    },
-    "emptyState": {
-      "icon": "#9f9f9f",
-      "title": "#dcdccb",
-      "description": "#9f9f9f",
-      "border": "#40403e"
-    },
-    "table": {
-      "border": "#40403e",
-      "headerBackground": "#2d2d2c",
-      "headerForeground": "#dcdccb",
-      "rowHover": "#383836",
-      "rowSelected": "#033638"
-    },
-    "charts": {
-      "series": [
-        "#8cd0d3",
-        "#dfaf8f",
-        "#7f9f7f",
-        "#f0dfaf",
-        "#cc9393"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#24a9af",
-      "selection": "#033638",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(0, 0, 0, 0.22)",
-      "md": "0 12px 32px rgba(0, 0, 0, 0.32)",
-      "lg": "0 24px 56px rgba(0, 0, 0, 0.42)",
-      "focus": "0 0 0 3px #8cd0d359"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/lib/theme/themes/zenburn-light.json b/packages/ui/src/lib/theme/themes/zenburn-light.json
deleted file mode 100644
index b86cbd0a..00000000
--- a/packages/ui/src/lib/theme/themes/zenburn-light.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-  "metadata": {
-    "id": "zenburn-light",
-    "name": "Zenburn",
-    "description": "Ported from OpenCode Zenburn theme (light variant)",
-    "author": "OpenCode",
-    "version": "1.0.0",
-    "variant": "light",
-    "tags": [
-      "light",
-      "opencode",
-      "ported",
-      "zenburn"
-    ]
-  },
-  "colors": {
-    "primary": {
-      "base": "#5f7f8f",
-      "hover": "#4d7689",
-      "active": "#588094",
-      "foreground": "#000000",
-      "muted": "#5f7f8f80",
-      "emphasis": "#4d7689"
-    },
-    "surface": {
-      "background": "#fffff4",
-      "foreground": "#333333",
-      "muted": "#f4f4e9",
-      "mutedForeground": "#6f6f6f",
-      "elevated": "#f9f9ef",
-      "elevatedForeground": "#333333",
-      "overlay": "#fffff433",
-      "subtle": "#ecece2"
-    },
-    "interactive": {
-      "border": "#d0d0c8",
-      "borderHover": "#c5c5bd",
-      "borderFocus": "#588094",
-      "selection": "#33333316",
-      "selectionForeground": "#333333",
-      "focus": "#588094",
-      "focusRing": "#58809447",
-      "cursor": "#222222",
-      "hover": "#3333330e",
-      "active": "#33333316"
-    },
-    "status": {
-      "error": "#8f5f5f",
-      "errorForeground": "#ffffff",
-      "errorBackground": "#fee2e1",
-      "errorBorder": "#eab0b0",
-      "warning": "#8f8f5f",
-      "warningForeground": "#000000",
-      "warningBackground": "#ecedca",
-      "warningBorder": "#c5c58f",
-      "success": "#5f8f5f",
-      "successForeground": "#000000",
-      "successBackground": "#d2f5d1",
-      "successBorder": "#9bd29a",
-      "info": "#8f7f5f",
-      "infoForeground": "#000000",
-      "infoBackground": "#f5e9d1",
-      "infoBorder": "#d2bf9a"
-    },
-    "pr": {
-      "open": "#5f8f5f",
-      "draft": "#6f6f6f",
-      "blocked": "#8f8f5f",
-      "merged": "#5f8f5f",
-      "closed": "#8f5f5f"
-    },
-    "syntax": {
-      "base": {
-        "background": "#f9f9ef",
-        "foreground": "#333333",
-        "comment": "#5f7f5f",
-        "keyword": "#8f8f5f",
-        "string": "#8f5f5f",
-        "number": "#5f8f5f",
-        "function": "#5f8f8f",
-        "variable": "#3f3f3f",
-        "type": "#5f8f8f",
-        "operator": "#8f8f5f"
-      },
-      "tokens": {
-        "commentDoc": "#5f7f5f",
-        "stringEscape": "#333333",
-        "keywordImport": "#8f8f5f",
-        "storageModifier": "#8f8f5f",
-        "functionCall": "#5f8f8f",
-        "method": "#5f8f8f",
-        "variableProperty": "#5f8f8f",
-        "variableOther": "#3f3f3f",
-        "variableGlobal": "#5f8f5f",
-        "variableLocal": "#3f3f3f",
-        "parameter": "#3f3f3f",
-        "constant": "#5f8f5f",
-        "class": "#5f8f8f",
-        "className": "#5f8f8f",
-        "interface": "#5f8f8f",
-        "struct": "#5f8f8f",
-        "enum": "#5f8f8f",
-        "typeParameter": "#5f8f8f",
-        "namespace": "#5f8f8f",
-        "module": "#8f8f5f",
-        "tag": "#8f8f5f",
-        "jsxTag": "#8f8f5f",
-        "tagAttribute": "#5f8f8f",
-        "tagAttributeValue": "#8f5f5f",
-        "boolean": "#5f8f5f",
-        "decorator": "#8f8f5f",
-        "label": "#5f8f8f",
-        "punctuation": "#3f3f3f",
-        "macro": "#8f8f5f",
-        "preprocessor": "#8f8f5f",
-        "regex": "#333333",
-        "url": "#4d7689",
-        "key": "#5f8f8f",
-        "exception": "#8f5f5f"
-      },
-      "highlights": {
-        "diffAdded": "#4c694c",
-        "diffAddedBackground": "#f5fcf5",
-        "diffRemoved": "#7b5555",
-        "diffRemovedBackground": "#fff7f7",
-        "diffModified": "#5f5d10",
-        "diffModifiedBackground": "#f5f6ed",
-        "lineNumber": "#939393",
-        "lineNumberActive": "#333333"
-      }
-    },
-    "header": {
-      "background": "#fffff4",
-      "foreground": "#333333",
-      "border": "#d0d0c8",
-      "icon": "#505050",
-      "hover": "#ecece2"
-    },
-    "sidebar": {
-      "background": "#f6f6eb",
-      "foreground": "#6f6f6f",
-      "border": "#d0d0c8",
-      "icon": "#d4d3ca",
-      "hover": "#ecece2",
-      "active": "#d7eefa",
-      "accent": "#5f7f8f",
-      "accentForeground": "#000000"
-    },
-    "chat": {
-      "background": "#fffff4",
-      "userMessage": "#333333",
-      "userMessageBackground": "#f4f4e9",
-      "assistantMessage": "#333333",
-      "assistantMessageBackground": "#fffff4",
-      "timestamp": "#939393",
-      "divider": "#e7e7de",
-      "typing": "#6f6f6f"
-    },
-    "markdown": {
-      "heading1": "#8f8f5f",
-      "heading2": "#8f8f5f",
-      "heading3": "#222222",
-      "heading4": "#333333",
-      "link": "#5f7f8f",
-      "linkHover": "#5f8f8f",
-      "inlineCode": "#5f8f5f",
-      "inlineCodeBackground": "#f4f4e9",
-      "blockquote": "#6f6f6f",
-      "blockquoteBorder": "#d0d0c8",
-      "listMarker": "#5f7f8f99",
-      "bold": "#8f7f5f",
-      "italic": "#8f8f5f",
-      "strikethrough": "#6f6f6f",
-      "hr": "#6f6f6f"
-    },
-    "tools": {
-      "background": "#f4f4e9",
-      "border": "#e7e7de",
-      "headerHover": "#ecece2",
-      "icon": "#d4d3ca",
-      "title": "#333333",
-      "description": "#6f6f6f",
-      "edit": {
-        "added": "#4c694c",
-        "addedBackground": "#f5fcf5",
-        "removed": "#996e6e",
-        "removedBackground": "#fff7f7",
-        "modified": "#5f5d10",
-        "modifiedBackground": "#f5f6ed",
-        "lineNumber": "#939393"
-      },
-      "bash": {
-        "background": "#f9f9ef",
-        "foreground": "#333333",
-        "info": "#8f7f5f",
-        "warning": "#8f8f5f",
-        "error": "#8f5f5f"
-      },
-      "lsp": {
-        "background": "#f9f9ef",
-        "foreground": "#333333",
-        "info": "#8f7f5f",
-        "warning": "#8f8f5f",
-        "error": "#8f5f5f"
-      }
-    },
-    "forms": {
-      "inputBackground": "#fffff4",
-      "inputForeground": "#333333",
-      "inputBorder": "#e7e7de",
-      "inputBorderHover": "#dcdcd3",
-      "inputBorderFocus": "#588094",
-      "inputPlaceholder": "#939393",
-      "inputDisabled": "#f1f1e5",
-      "inputSelection": "#d7eefa",
-      "label": "#6f6f6f",
-      "helperText": "#939393"
-    },
-    "buttons": {
-      "primary": {
-        "bg": "#5f7f8f",
-        "fg": "#000000",
-        "border": "#a3c8da",
-        "hover": "#4d7689",
-        "active": "#588094",
-        "disabled": "#d8d8cf"
-      },
-      "secondary": {
-        "bg": "#f9f9ef",
-        "fg": "#333333",
-        "border": "#d0d0c8",
-        "hover": "#f4f4e9",
-        "active": "#ecece2",
-        "disabled": "#f1f1e5"
-      },
-      "ghost": {
-        "bg": "#00000000",
-        "fg": "#333333",
-        "border": "#00000000",
-        "hover": "#f4f4e9",
-        "active": "#ecece2",
-        "disabled": "#939393"
-      },
-      "destructive": {
-        "bg": "#8f5f5f",
-        "fg": "#ffffff",
-        "border": "#eab0b0",
-        "hover": "#fed4d3",
-        "active": "#955b5c",
-        "disabled": "#f1f1e5"
-      }
-    },
-    "modal": {
-      "background": "#f9f9ef",
-      "foreground": "#333333",
-      "border": "#d0d0c8",
-      "overlay": "#fffff43d"
-    },
-    "popover": {
-      "background": "#f9f9ef",
-      "foreground": "#333333",
-      "border": "#d0d0c8",
-      "shadow": "0 18px 48px rgba(15, 15, 15, 0.16)"
-    },
-    "commandPalette": {
-      "background": "#f9f9ef",
-      "foreground": "#333333",
-      "border": "#d0d0c8",
-      "inputBackground": "#fffff4",
-      "selectedBackground": "#d7eefa",
-      "selectedForeground": "#333333",
-      "muted": "#6f6f6f"
-    },
-    "fileAttachment": {
-      "background": "#f4f4e9",
-      "foreground": "#333333",
-      "border": "#e7e7de",
-      "icon": "#d4d3ca",
-      "removeHover": "#fee2e1"
-    },
-    "sessions": {
-      "background": "#fffff4",
-      "foreground": "#333333",
-      "mutedForeground": "#6f6f6f",
-      "border": "#efefe5",
-      "hover": "#ecece2",
-      "active": "#d7eefa"
-    },
-    "modelSelector": {
-      "background": "#f9f9ef",
-      "foreground": "#333333",
-      "border": "#d0d0c8",
-      "selectedBackground": "#d7eefa",
-      "selectedForeground": "#333333"
-    },
-    "permissions": {
-      "background": "#f9f9ef",
-      "foreground": "#333333",
-      "border": "#d0d0c8",
-      "allow": "#5f8f5f",
-      "allowBackground": "#d2f5d1",
-      "deny": "#8f5f5f",
-      "denyBackground": "#fee2e1"
-    },
-    "loading": {
-      "spinner": "#5f7f8f",
-      "spinnerTrack": "#ecece2",
-      "skeleton": "#f4f4e9",
-      "shimmer": "#ecece2"
-    },
-    "scrollbar": {
-      "track": "transparent",
-      "thumb": "#33333326",
-      "thumbHover": "#33333340"
-    },
-    "badges": {
-      "default": {
-        "bg": "#f4f4e9",
-        "fg": "#333333",
-        "border": "#e7e7de"
-      },
-      "info": {
-        "bg": "#f5e9d1",
-        "fg": "#8f7f5f",
-        "border": "#d2bf9a"
-      },
-      "success": {
-        "bg": "#d2f5d1",
-        "fg": "#5f8f5f",
-        "border": "#9bd29a"
-      },
-      "warning": {
-        "bg": "#ecedca",
-        "fg": "#8f8f5f",
-        "border": "#c5c58f"
-      },
-      "error": {
-        "bg": "#fee2e1",
-        "fg": "#8f5f5f",
-        "border": "#eab0b0"
-      }
-    },
-    "toast": {
-      "background": "#f9f9ef",
-      "foreground": "#333333",
-      "border": "#d0d0c8",
-      "success": {
-        "background": "#d2f5d1",
-        "foreground": "#5f8f5f",
-        "border": "#9bd29a"
-      },
-      "warning": {
-        "background": "#ecedca",
-        "foreground": "#8f8f5f",
-        "border": "#c5c58f"
-      },
-      "error": {
-        "background": "#fee2e1",
-        "foreground": "#8f5f5f",
-        "border": "#eab0b0"
-      },
-      "info": {
-        "background": "#f5e9d1",
-        "foreground": "#8f7f5f",
-        "border": "#d2bf9a"
-      }
-    },
-    "emptyState": {
-      "icon": "#6f6f6f",
-      "title": "#333333",
-      "description": "#6f6f6f",
-      "border": "#efefe5"
-    },
-    "table": {
-      "border": "#efefe5",
-      "headerBackground": "#f9f9ef",
-      "headerForeground": "#333333",
-      "rowHover": "#ecece2",
-      "rowSelected": "#d7eefa"
-    },
-    "charts": {
-      "series": [
-        "#5f7f8f",
-        "#8f7f5f",
-        "#5f8f5f",
-        "#8f8f5f",
-        "#8f5f5f"
-      ]
-    },
-    "a11y": {
-      "focusRing": "#588094",
-      "selection": "#d7eefa",
-      "highContrast": false
-    },
-    "shadows": {
-      "sm": "0 2px 8px rgba(15, 15, 15, 0.08)",
-      "md": "0 12px 32px rgba(15, 15, 15, 0.12)",
-      "lg": "0 24px 56px rgba(15, 15, 15, 0.16)",
-      "focus": "0 0 0 3px #5f7f8f40"
-    },
-    "animation": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease",
-      "emphasis": "450ms cubic-bezier(0.2, 0.8, 0.2, 1)"
-    }
-  },
-  "config": {
-    "fonts": {
-      "sans": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "mono": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace",
-      "heading": "ui-monospace, \"SFMono-Regular\", \"Menlo\", \"Cascadia Mono\", \"Segoe UI Mono\", monospace"
-    },
-    "spacing": {
-      "xs": "0.25rem",
-      "sm": "0.5rem",
-      "md": "0.75rem",
-      "lg": "1rem",
-      "xl": "1.5rem"
-    },
-    "transitions": {
-      "fast": "150ms ease",
-      "normal": "250ms ease",
-      "slow": "350ms ease"
-    }
-  }
-}
diff --git a/packages/ui/src/styles/design-system.css b/packages/ui/src/styles/design-system.css
index 17b8401c..830ac79e 100644
--- a/packages/ui/src/styles/design-system.css
+++ b/packages/ui/src/styles/design-system.css
@@ -101,15 +101,7 @@
   }
 
   * {
-    border-color: hsl(var(--border));
-  }
-
-  :root * {
-    border-color: rgba(194, 151, 77, 0.2); /* Warm golden sand borders for light mode */
-  }
-
-  .dark * {
-    border-color: rgba(57, 56, 54, 0.5); /* #393836 at 50% opacity */
+    border-color: var(--border); /* Theme border token (interactive.border) — opaque and theme-aware */
   }
 
   body {
diff --git a/scripts/harmonize-theme.mjs b/scripts/harmonize-theme.mjs
new file mode 100644
index 00000000..9415ba51
--- /dev/null
+++ b/scripts/harmonize-theme.mjs
@@ -0,0 +1,275 @@
+#!/usr/bin/env node
+/**
+ * harmonize-theme.mjs
+ *
+ * Aligns a theme's accent palette in OKLCH space so every accent shares one
+ * saturation (chroma) and one brightness (lightness) target while keeping its
+ * own hue. This is how you make colors borrowed from different themes feel like
+ * one family — e.g. pulling Flexoki's punchy status hues down to Vitesse's
+ * calmer saturation.
+ *
+ * It only touches the accent roles listed in ACCENT_ROLES (primary / status /
+ * pr). Surfaces, borders, text, and syntax are left untouched — syntax is
+ * usually already the reference you are matching to.
+ *
+ * Pipeline per color:  hex -> linear sRGB -> OKLab -> OKLCH
+ *   -> set L = target.l, C = target.c, keep H
+ *   -> gamut-fit (reduce C until it fits sRGB) -> hex (alpha preserved)
+ *
+ * Usage:
+ *   node scripts/harmonize-theme.mjs <theme.json>              # dry-run table
+ *   node scripts/harmonize-theme.mjs <theme.json> --write      # rewrite in place
+ *   node scripts/harmonize-theme.mjs <theme.json> --out=x.json
+ *   Overrides: --l=0.70 --c=0.085   (defaults are chosen per light/dark variant)
+ *
+ * No dependencies; math ported from the OpenCode desktop color engine.
+ */
+import fs from 'node:fs';
+
+// ---- sRGB <-> OKLCH ---------------------------------------------------------
+const clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
+const hue = (v) => ((v % 360) + 360) % 360;
+
+function parseHex(hex) {
+  let h = hex.replace('#', '');
+  if (h.length === 3 || h.length === 4) h = h.split('').map((c) => c + c).join('');
+  const a = h.length === 8 ? h.slice(6, 8) : null;
+  const n = parseInt(h.slice(0, 6), 16);
+  return { r: ((n >> 16) & 255) / 255, g: ((n >> 8) & 255) / 255, b: (n & 255) / 255, alpha: a };
+}
+function toHex(r, g, b, alpha) {
+  const c = (v) => Math.round(clamp(v, 0, 1) * 255).toString(16).padStart(2, '0');
+  return `#${c(r)}${c(g)}${c(b)}${alpha ?? ''}`;
+}
+const srgbToLinear = (v) => (v <= 0.04045 ? v / 12.92 : Math.pow((v + 0.055) / 1.055, 2.4));
+const linearToSrgb = (v) => (v <= 0.0031308 ? v * 12.92 : 1.055 * Math.pow(v, 1 / 2.4) - 0.055);
+
+function rgbToOklch(r, g, b) {
+  const lr = srgbToLinear(r), lg = srgbToLinear(g), lb = srgbToLinear(b);
+  const l_ = 0.4122214708 * lr + 0.5363325363 * lg + 0.0514459929 * lb;
+  const m_ = 0.2119034982 * lr + 0.6806995451 * lg + 0.1073969566 * lb;
+  const s_ = 0.0883024619 * lr + 0.2817188376 * lg + 0.6299787005 * lb;
+  const l = Math.cbrt(l_), m = Math.cbrt(m_), s = Math.cbrt(s_);
+  const L = 0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s;
+  const a = 1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s;
+  const bb = 0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s;
+  let H = Math.atan2(bb, a) * (180 / Math.PI);
+  if (H < 0) H += 360;
+  return { l: L, c: Math.sqrt(a * a + bb * bb), h: H };
+}
+function oklchToRgb({ l: L, c: C, h: H }) {
+  const a = C * Math.cos((H * Math.PI) / 180);
+  const b = C * Math.sin((H * Math.PI) / 180);
+  const l = L + 0.3963377774 * a + 0.2158037573 * b;
+  const m = L - 0.1055613458 * a - 0.0638541728 * b;
+  const s = L - 0.0894841775 * a - 1.291485548 * b;
+  const l3 = l * l * l, m3 = m * m * m, s3 = s * s * s;
+  return {
+    r: linearToSrgb(4.0767416621 * l3 - 3.3077115913 * m3 + 0.2309699292 * s3),
+    g: linearToSrgb(-1.2684380046 * l3 + 2.6097574011 * m3 - 0.3413193965 * s3),
+    b: linearToSrgb(-0.0041960863 * l3 - 0.7034186147 * m3 + 1.707614701 * s3),
+  };
+}
+const inGamut = ({ r, g, b }) => r >= 0 && r <= 1 && g >= 0 && g <= 1 && b >= 0 && b <= 1;
+function fitOklch(o) {
+  const base = { l: clamp(o.l, 0, 1), c: Math.max(0, o.c), h: hue(o.h) };
+  if (inGamut(oklchToRgb(base))) return base;
+  let c = base.c;
+  for (let i = 0; i < 24; i++) {
+    c *= 0.9;
+    const next = { ...base, c };
+    if (inGamut(oklchToRgb(next))) return next;
+  }
+  return { ...base, c: 0 };
+}
+function oklchToHex(o, alpha) {
+  const { r, g, b } = oklchToRgb(fitOklch(o));
+  return toHex(r, g, b, alpha);
+}
+
+// ---- harmonization ----------------------------------------------------------
+// Per variant: the single chroma (saturation) and lightness every accent lands
+// on. Dark values match Vitesse Dark's calm accents (~L .68, C .085); light
+// values match Vitesse Light (~L .55, C .10) and stay readable on white.
+const TARGETS = {
+  dark: { l: 0.68, c: 0.135 },
+  light: { l: 0.55, c: 0.145 },
+};
+
+// Status accent roles to align. Each re-derives its translucent background,
+// border, and on-fill text color from the harmonized base.
+const STATUS_ROLES = ['error', 'warning', 'success', 'info'];
+// pr accents that carry a hue (draft stays a neutral grey, so it is skipped).
+const PR_ROLES = ['open', 'blocked', 'merged', 'closed'];
+const STATUS_BG_ALPHA = '20';
+const STATUS_BORDER_ALPHA = '50';
+// Lightness offsets applied to the harmonized primary base to derive its
+// interaction shades (dark themes lift on hover/press, light themes deepen).
+const PRIMARY_OFFSETS = {
+  dark: { hover: 0.05, active: 0.1, emphasis: 0.1 },
+  light: { hover: -0.06, active: -0.11, emphasis: -0.06 },
+};
+
+function harmonize(hex, target) {
+  const { r, g, b, alpha } = parseHex(hex);
+  const src = rgbToOklch(r, g, b);
+  const out = { l: target.l, c: target.c, h: src.h };
+  return { hex: oklchToHex(out, alpha), src, out };
+}
+// shift a harmonized base to a new lightness, keeping chroma + hue
+function atLightness(hex, l) {
+  const { r, g, b } = parseHex(hex);
+  const o = rgbToOklch(r, g, b);
+  return oklchToHex({ l: clamp(l, 0, 1), c: o.c, h: o.h });
+}
+// pick #000 / #fff for text on a solid fill
+function onColor(hex) {
+  const { r, g, b } = parseHex(hex);
+  const L = rgbToOklch(r, g, b).l;
+  return L > 0.6 ? '#000000' : '#ffffff';
+}
+// multiply chroma by a factor, keeping lightness + hue (gamut-fit clamps the
+// already-saturated ones, so pastels gain the most). Used to de-pastel syntax.
+function scaleChroma(hex, factor) {
+  const { r, g, b, alpha } = parseHex(hex);
+  const src = rgbToOklch(r, g, b);
+  const out = { l: src.l, c: src.c * factor, h: src.h };
+  return { hex: oklchToHex(out, alpha), src, out };
+}
+
+// Syntax token colors are boosted, but not the code panel background, the
+// default text color, or the deliberately-muted local-variable tone.
+const SYNTAX_SKIP_BASE = new Set(['background', 'foreground']);
+const SYNTAX_SKIP_TOKENS = new Set(['variableLocal']);
+
+function saturateSyntax(theme, factor) {
+  const syntax = theme.colors?.syntax;
+  const rows = [];
+  const bump = (bag, skip, prefix) => {
+    if (!bag) return;
+    for (const [key, val] of Object.entries(bag)) {
+      if (typeof val !== 'string' || skip.has(key)) continue;
+      const { hex, src, out } = scaleChroma(val, factor);
+      bag[key] = hex;
+      rows.push([`${prefix}.${key}`, val, hex, src, out]);
+    }
+  };
+  bump(syntax?.base, SYNTAX_SKIP_BASE, 'base');
+  bump(syntax?.tokens, SYNTAX_SKIP_TOKENS, 'tokens');
+  return rows;
+}
+
+function main() {
+  const args = process.argv.slice(2);
+  const file = args.find((a) => !a.startsWith('--'));
+  if (!file) {
+    console.error(
+      'usage: node scripts/harmonize-theme.mjs <theme.json> [--write] [--out=path] [--l=..] [--c=..]\n' +
+        '       node scripts/harmonize-theme.mjs <theme.json> --syntax[=factor] [--write]  (boost syntax saturation only)',
+    );
+    process.exit(1);
+  }
+  const write = args.includes('--write');
+  const outArg = args.find((a) => a.startsWith('--out='));
+  const lArg = args.find((a) => a.startsWith('--l='));
+  const cArg = args.find((a) => a.startsWith('--c='));
+
+  const theme = JSON.parse(fs.readFileSync(file, 'utf8'));
+  const variant = theme.metadata?.variant === 'light' ? 'light' : 'dark';
+  const target = { ...TARGETS[variant] };
+  if (lArg) target.l = parseFloat(lArg.split('=')[1]);
+  if (cArg) target.c = parseFloat(cArg.split('=')[1]);
+
+  // --- syntax-only mode: boost token saturation, leave accents untouched ---
+  const synArg = args.find((a) => a === '--syntax' || a.startsWith('--syntax='));
+  if (synArg) {
+    const factor = synArg.includes('=') ? parseFloat(synArg.split('=')[1]) : 1.3;
+    const rows = saturateSyntax(theme, factor);
+    console.log(`\n${file}  (syntax saturation ×${factor}, variant: ${variant})\n`);
+    console.log('  token                before   ->  after     C (chroma)');
+    for (const [name, before, after, src, out] of rows) {
+      console.log(
+        `  ${name.padEnd(20)} ${before.slice(0, 7)} -> ${after.slice(0, 7)}   ${src.c.toFixed(3)}→${out.c.toFixed(3)}`,
+      );
+    }
+    const outPath = outArg ? outArg.split('=')[1] : file;
+    if (write || outArg) {
+      fs.writeFileSync(outPath, JSON.stringify(theme, null, 2) + '\n');
+      console.log(`\nwrote ${outPath}`);
+    } else {
+      console.log('\n(dry run — pass --write to save)');
+    }
+    return;
+  }
+
+  const rows = [];
+  const record = (name, before, after, src, out) => rows.push([name, before, after, src, out]);
+
+  // --- primary: harmonize base, derive interaction shades from it ----------
+  const primary = theme.colors?.primary;
+  if (primary && typeof primary.base === 'string') {
+    const { hex, src, out } = harmonize(primary.base, target);
+    record('primary.base', primary.base, hex, src, out);
+    primary.base = hex;
+    const off = PRIMARY_OFFSETS[variant];
+    if ('hover' in primary) primary.hover = atLightness(hex, target.l + off.hover);
+    if ('active' in primary) primary.active = atLightness(hex, target.l + off.active);
+    if ('emphasis' in primary) primary.emphasis = atLightness(hex, target.l + off.emphasis);
+    if ('muted' in primary) primary.muted = hex.slice(0, 7) + '80';
+    if ('foreground' in primary) primary.foreground = onColor(hex);
+
+    // Wire the interactive focus/selection accent to the harmonized primary.
+    const inter = theme.colors?.interactive;
+    if (inter) {
+      if ('borderFocus' in inter) inter.borderFocus = hex;
+      if ('focus' in inter) inter.focus = hex;
+      if ('focusRing' in inter) inter.focusRing = hex.slice(0, 7) + '55';
+      if ('selection' in inter) inter.selection = hex.slice(0, 7) + '2b';
+    }
+  }
+
+  // --- status: harmonize base, re-derive tints + on-fill text --------------
+  const status = theme.colors?.status;
+  if (status) {
+    for (const key of STATUS_ROLES) {
+      if (typeof status[key] !== 'string') continue;
+      const { hex, src, out } = harmonize(status[key], target);
+      record(`status.${key}`, status[key], hex, src, out);
+      status[key] = hex;
+      const bare = hex.slice(0, 7);
+      if (`${key}Background` in status) status[`${key}Background`] = bare + STATUS_BG_ALPHA;
+      if (`${key}Border` in status) status[`${key}Border`] = bare + STATUS_BORDER_ALPHA;
+      if (`${key}Foreground` in status) status[`${key}Foreground`] = onColor(hex);
+    }
+  }
+
+  // --- pr: harmonize the hued roles ----------------------------------------
+  const pr = theme.colors?.pr;
+  if (pr) {
+    for (const key of PR_ROLES) {
+      if (typeof pr[key] !== 'string') continue;
+      const { hex, src, out } = harmonize(pr[key], target);
+      record(`pr.${key}`, pr[key], hex, src, out);
+      pr[key] = hex;
+    }
+  }
+
+  console.log(`\n${file}  (variant: ${variant}, target L=${target.l} C=${target.c})\n`);
+  console.log('  token                before   ->  after     ΔC (chroma)');
+  for (const [name, before, after, src, out] of rows) {
+    console.log(
+      `  ${name.padEnd(20)} ${before.slice(0, 7)} -> ${after.slice(0, 7)}   ` +
+        `${src.c.toFixed(3)}→${out.c.toFixed(3)}  L ${src.l.toFixed(2)}→${out.l.toFixed(2)}  H${Math.round(src.h)}`,
+    );
+  }
+
+  const outPath = outArg ? outArg.split('=')[1] : file;
+  if (write || outArg) {
+    fs.writeFileSync(outPath, JSON.stringify(theme, null, 2) + '\n');
+    console.log(`\nwrote ${outPath}`);
+  } else {
+    console.log('\n(dry run — pass --write to save, or --out=path)');
+  }
+}
+
+main();