diff --git a/packages/ui/src/lib/theme/themes/vesper-dark.json b/packages/ui/src/lib/theme/themes/vesper-dark.json
index cb2d9b96..36d82259 100644
--- a/packages/ui/src/lib/theme/themes/vesper-dark.json
+++ b/packages/ui/src/lib/theme/themes/vesper-dark.json
@@ -20,17 +20,17 @@
       "emphasis": "#DBAC84"
     },
     "surface": {
-      "background": "#101010",
-      "foreground": "#FFFFFF",
-      "muted": "#141414",
-      "mutedForeground": "#7f7f7f",
-      "elevated": "#110f0f",
+      "background": "#151515",
+      "foreground": "#e8e5e5",
+      "muted": "#1c1b1b",
+      "mutedForeground": "#848484",
+      "elevated": "#242121",
       "elevatedForeground": "#FFFFFF",
       "overlay": "#FFFFFF20",
       "subtle": "#232323"
     },
     "interactive": {
-      "border": "#3d3d3d",
+      "border": "#494949",
       "borderHover": "#202020",
       "borderFocus": "#383838",
       "selection": "#b1adad33",
@@ -133,15 +133,15 @@
       "heading4": "#FFFFFF",
       "link": "#A0A0A0",
       "linkHover": "#FFC799",
-      "inlineCode": "#A0A0A0",
-      "inlineCodeBackground": "#141414",
+      "inlineCode": "#bba2a2",
+      "inlineCodeBackground": "#292727",
       "blockquote": "#FFFFFF",
       "blockquoteBorder": "#1C1C1C",
       "listMarker": "#FFFFFF99"
     },
     "chat": {
       "userMessage": "#FFFFFF",
-      "userMessageBackground": "#232323",
+      "userMessageBackground": "#2b2a2a",
       "assistantMessage": "#FFFFFF",
       "assistantMessageBackground": "#101010",
       "timestamp": "#A0A0A0",
diff --git a/packages/ui/src/lib/theme/themes/vesper-light.json b/packages/ui/src/lib/theme/themes/vesper-light.json
index 8290afba..facf6321 100644
--- a/packages/ui/src/lib/theme/themes/vesper-light.json
+++ b/packages/ui/src/lib/theme/themes/vesper-light.json
@@ -12,115 +12,115 @@
   },
   "colors": {
     "primary": {
-      "base": "#f5a666",
+      "base": "#a06535",
       "hover": "#FFD2AD",
       "active": "#D9A982",
       "foreground": "#FFFFFF",
-      "muted": "#FFC79980",
+      "muted": "#cf9c7280",
       "emphasis": "#FFD2AD"
     },
     "surface": {
       "background": "#FFFFFF",
       "foreground": "#101010",
       "muted": "#F8F8F8",
-      "mutedForeground": "#908d8d",
-      "elevated": "#F0F0F0",
+      "mutedForeground": "#6e6d6d",
+      "elevated": "#f6f5f5",
       "elevatedForeground": "#101010",
       "overlay": "#00000020",
       "subtle": "#f5f3f3"
     },
     "interactive": {
-      "border": "#dad7d7",
+      "border": "#d0cece",
       "borderHover": "#E0E0E0",
       "borderFocus": "#C0C0C0",
       "selection": "#5e5b5b22",
       "selectionForeground": "#000000",
-      "focus": "#FFC799",
-      "focusRing": "#FFC79940",
+      "focus": "#be875b",
+      "focusRing": "#cf9c7240",
       "cursor": "#000000",
       "hover": "#5e5c5c22",
       "active": "#48474722"
     },
     "status": {
-      "error": "#FF8080",
+      "error": "#d46868",
       "errorForeground": "#FFFFFF",
-      "errorBackground": "#FF808020",
-      "errorBorder": "#FF808050",
-      "warning": "#f4994e",
+      "errorBackground": "#b95f5f20",
+      "errorBorder": "#b95f5f50",
+      "warning": "#cb7f40",
       "warningForeground": "#FFFFFF",
-      "warningBackground": "#FFC79920",
-      "warningBorder": "#FFC79950",
-      "success": "#12b489",
+      "warningBackground": "#cf9c7220",
+      "warningBorder": "#cf9c7250",
+      "success": "#109b76",
       "successForeground": "#FFFFFF",
       "successBackground": "#99FFE420",
       "successBorder": "#99FFE450",
       "info": "#62bced",
       "infoForeground": "#FFFFFF",
-      "infoBackground": "#FFC79920",
-      "infoBorder": "#FFC79950"
+      "infoBackground": "#cf9c7220",
+      "infoBorder": "#cf9c7250"
     },
     "pr": {
-      "open": "#12b489",
-      "draft": "#A0A0A0",
-      "blocked": "#f4994e",
-      "merged": "#bf74e8",
-      "closed": "#FF8080"
+      "open": "#0f926f",
+      "draft": "#888787",
+      "blocked": "#bf6f2e",
+      "merged": "#9f5fc1",
+      "closed": "#c56161"
     },
     "syntax": {
       "base": {
         "background": "#F8F8F8",
         "foreground": "#101010",
-        "comment": "#A0A0A0",
-        "keyword": "#FFC799",
-        "string": "#55d9b6",
-        "number": "#FF8080",
-        "function": "#FFC799",
+        "comment": "#868686",
+        "keyword": "#cf9c72",
+        "string": "#43ae91",
+        "number": "#b95f5f",
+        "function": "#cf9c72",
         "variable": "#101010",
-        "type": "#FFC799",
-        "operator": "#FF8080"
+        "type": "#cf9c72",
+        "operator": "#b95f5f"
       },
       "tokens": {
-        "boolean": "#FFC799",
-        "class": "#FFC799",
-        "className": "#FFC799",
+        "boolean": "#cf9c72",
+        "class": "#cf9c72",
+        "className": "#cf9c72",
         "commentDoc": "#D0D0D0",
-        "constant": "#A0A0A0",
-        "decorator": "#FFC799",
-        "enum": "#FFC799",
-        "exception": "#FF8080",
-        "functionCall": "#FFC799",
-        "interface": "#FFC799",
-        "jsxTag": "#FFC799",
-        "key": "#FFC799",
-        "keywordImport": "#FF8080",
-        "label": "#FF8080",
-        "macro": "#A0A0A0",
+        "constant": "#838282",
+        "decorator": "#cf9c72",
+        "enum": "#cf9c72",
+        "exception": "#b95f5f",
+        "functionCall": "#cf9c72",
+        "interface": "#cf9c72",
+        "jsxTag": "#cf9c72",
+        "key": "#cf9c72",
+        "keywordImport": "#b95f5f",
+        "label": "#b95f5f",
+        "macro": "#717070",
         "method": "#74e8c9",
-        "module": "#FF8080",
-        "namespace": "#FFC799",
+        "module": "#b95f5f",
+        "namespace": "#cf9c72",
         "parameter": "#101010",
-        "preprocessor": "#FF8080",
-        "punctuation": "#A0A0A0",
+        "preprocessor": "#b95f5f",
+        "punctuation": "#717070",
         "regex": "#67e7c5",
-        "storageModifier": "#A0A0A0",
+        "storageModifier": "#7b7b7b",
         "stringEscape": "#000000",
-        "struct": "#FFC799",
-        "tag": "#FFC799",
-        "tagAttribute": "#FFC799",
+        "struct": "#cf9c72",
+        "tag": "#cf9c72",
+        "tagAttribute": "#cf9c72",
         "tagAttributeValue": "#6adebf",
-        "typeParameter": "#FFC799",
-        "url": "#A0A0A0",
-        "variableGlobal": "#FFC799",
+        "typeParameter": "#cf9c72",
+        "url": "#797878",
+        "variableGlobal": "#cf9c72",
         "variableLocal": "#F0F0F0",
         "variableOther": "#49dcb5",
-        "variableProperty": "#A0A0A0"
+        "variableProperty": "#717070"
       },
       "highlights": {
         "diffAdded": "#56d8b5",
         "diffAddedBackground": "#E8F5E8",
-        "diffModified": "#FFC799",
+        "diffModified": "#cf9c72",
         "diffModifiedBackground": "#F0F0F0",
-        "diffRemoved": "#FF8080",
+        "diffRemoved": "#b95f5f",
         "diffRemovedBackground": "#F5E8E8",
         "lineNumber": "#D0D0D0",
         "lineNumberActive": "#000000"
@@ -131,34 +131,34 @@
       "heading2": "#101010",
       "heading3": "#101010",
       "heading4": "#101010",
-      "link": "#A0A0A0",
-      "linkHover": "#FFC799",
-      "inlineCode": "#796363",
-      "inlineCodeBackground": "#F8F8F8",
+      "link": "#717070",
+      "linkHover": "#c48959",
+      "inlineCode": "#665050",
+      "inlineCodeBackground": "#f3f1f1",
       "blockquote": "#101010",
       "blockquoteBorder": "#E8E8E8",
       "listMarker": "#10101099"
     },
     "chat": {
       "userMessage": "#101010",
-      "userMessageBackground": "#F8F8F8",
+      "userMessageBackground": "#f4f1f1",
       "assistantMessage": "#101010",
       "assistantMessageBackground": "#FFFFFF",
-      "timestamp": "#A0A0A0",
+      "timestamp": "#717070",
       "divider": "#E8E8E8"
     },
     "tools": {
       "background": "#F8F8F880",
       "border": "#d0cece80",
       "headerHover": "#E8E8E8",
-      "icon": "#A0A0A0",
+      "icon": "#717070",
       "title": "#101010",
-      "description": "#A0A0A0",
+      "description": "#717070",
       "edit": {
         "added": "#40d7af",
         "addedBackground": "#99FFE425",
-        "removed": "#FF8080",
-        "removedBackground": "#FF808025",
+        "removed": "#b95f5f",
+        "removedBackground": "#b95f5f25",
         "lineNumber": "#b4b2b2"
       }
     }