diff --git a/packages/ui/src/lib/theme/themes/presets.ts b/packages/ui/src/lib/theme/themes/presets.ts
index 86320ffd..479f0824 100644
--- a/packages/ui/src/lib/theme/themes/presets.ts
+++ b/packages/ui/src/lib/theme/themes/presets.ts
@@ -32,6 +32,8 @@ 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';
 import mono_light_Raw from './mono-light.json';
+import vitesse_dark_dark_Raw from './vitesse-dark-dark.json';
+import vitesse_light_light_Raw from './vitesse-light-light.json';
 
 export const presetThemes: Theme[] = [
   aura_dark_Raw as Theme,
@@ -66,4 +68,6 @@ export const presetThemes: Theme[] = [
   mono_plus_light_Raw as Theme,
   mono_dark_Raw as Theme,
   mono_light_Raw as Theme,
+  vitesse_dark_dark_Raw as Theme,
+  vitesse_light_light_Raw as Theme,
 ];
diff --git a/packages/ui/src/lib/theme/themes/vitesse-dark-dark.json b/packages/ui/src/lib/theme/themes/vitesse-dark-dark.json
new file mode 100644
index 00000000..8a6c7e1b
--- /dev/null
+++ b/packages/ui/src/lib/theme/themes/vitesse-dark-dark.json
@@ -0,0 +1,159 @@
+{
+  "metadata": {
+    "id": "vitesse-dark-dark",
+    "name": "Vitesse Dark",
+    "description": "Converted from VS Code theme",
+    "version": "1.0.0",
+    "variant": "dark",
+    "tags": [
+      "dark",
+      "converted",
+      "vscode"
+    ]
+  },
+  "colors": {
+    "primary": {
+      "base": "#4d9375",
+      "hover": "#4d9375",
+      "active": "#5cb08c",
+      "foreground": "#121212",
+      "muted": "#4d937580",
+      "emphasis": "#64bf98"
+    },
+    "surface": {
+      "background": "#121212",
+      "foreground": "#dbd7caee",
+      "muted": "#171717",
+      "mutedForeground": "#dedcd59c",
+      "elevated": "#1a1a1a",
+      "elevatedForeground": "#dbd7caee",
+      "overlay": "#12121280",
+      "subtle": "#212020"
+    },
+    "interactive": {
+      "border": "#2f2f2f",
+      "borderHover": "#3c3c3c",
+      "borderFocus": "#00000000",
+      "selection": "#eeeeee18",
+      "selectionForeground": "#dbd7caee",
+      "focus": "#00000000",
+      "focusRing": "#0000000050",
+      "cursor": "#CECDC3",
+      "hover": "#eeeeee14",
+      "active": "#eeeeee18"
+    },
+    "status": {
+      "error": "#cb7676",
+      "errorForeground": "#121212",
+      "errorBackground": "#cb767620",
+      "errorBorder": "#cb767650",
+      "warning": "#d4976c",
+      "warningForeground": "#121212",
+      "warningBackground": "#d4976c20",
+      "warningBorder": "#d4976c50",
+      "success": "#4d9375",
+      "successForeground": "#121212",
+      "successBackground": "#4d937520",
+      "successBorder": "#4d937550",
+      "info": "#6394bf",
+      "infoForeground": "#121212",
+      "infoBackground": "#6394bf20",
+      "infoBorder": "#6394bf50"
+    },
+    "syntax": {
+      "base": {
+        "background": "#121212",
+        "foreground": "#dbd7caee",
+        "comment": "#758575dd",
+        "keyword": "#4d9375",
+        "string": "#c98a7d",
+        "number": "#4C9A91",
+        "function": "#80a665",
+        "variable": "#bd976a",
+        "type": "#5d99a9",
+        "operator": "#cb7676"
+      },
+      "tokens": {
+        "commentDoc": "#575653",
+        "stringEscape": "#dbd7caee",
+        "keywordImport": "#D14D41",
+        "storageModifier": "#4385BE",
+        "functionCall": "#80a665",
+        "method": "#879A39",
+        "variableProperty": "#b8a965",
+        "variableOther": "#879A39",
+        "class": "#6872ab",
+        "className": "#6872ab",
+        "interface": "#5d99a9",
+        "tag": "#4d9375",
+        "boolean": "#4d9375",
+        "url": "#c98a7d",
+        "key": "#b8a965"
+      },
+      "highlights": {
+        "diffAdded": "#4d9375",
+        "diffAddedBackground": "#4d937520",
+        "diffRemoved": "#cb7676",
+        "diffRemovedBackground": "#cb767620",
+        "lineNumber": "#dedcd550",
+        "lineNumberActive": "#bfbaaa"
+      }
+    },
+    "markdown": {
+      "heading1": "#4d9375",
+      "heading2": "#4d9375",
+      "heading3": "#4d9375",
+      "heading4": "#dbd7caee",
+      "link": "#4d9375",
+      "linkHover": "#4d9375",
+      "inlineCode": "#80a665",
+      "inlineCodeBackground": "#121212",
+      "blockquote": "#dedcd550",
+      "blockquoteBorder": "#ffffff15",
+      "listMarker": "#4d937599"
+    },
+    "chat": {
+      "userMessage": "#dbd7caee",
+      "userMessageBackground": "#252525",
+      "assistantMessage": "#dbd7caee",
+      "assistantMessageBackground": "#121212",
+      "timestamp": "#dedcd550",
+      "divider": "#ffffff15"
+    },
+    "tools": {
+      "background": "#12121250",
+      "border": "#2d2c2c",
+      "headerHover": "#ffffff1550",
+      "icon": "#dedcd5a4",
+      "title": "#dbd7caee",
+      "description": "#dedcd550",
+      "edit": {
+        "added": "#4d9375",
+        "addedBackground": "#4d937520",
+        "removed": "#cb7676",
+        "removedBackground": "#cb767620",
+        "lineNumber": "#ffffff24"
+      }
+    }
+  },
+  "config": {
+    "fonts": {
+      "sans": "\"IBM Plex Mono\", monospace",
+      "mono": "\"IBM Plex Mono\", monospace",
+      "heading": "\"IBM Plex Mono\", monospace"
+    },
+    "radius": {
+      "none": "0",
+      "sm": "0.125rem",
+      "md": "0.375rem",
+      "lg": "0.5rem",
+      "xl": "0.75rem",
+      "full": "9999px"
+    },
+    "transitions": {
+      "fast": "150ms ease",
+      "normal": "250ms ease",
+      "slow": "350ms ease"
+    }
+  }
+}
diff --git a/packages/ui/src/lib/theme/themes/vitesse-light-light.json b/packages/ui/src/lib/theme/themes/vitesse-light-light.json
new file mode 100644
index 00000000..1888ebe4
--- /dev/null
+++ b/packages/ui/src/lib/theme/themes/vitesse-light-light.json
@@ -0,0 +1,159 @@
+{
+  "metadata": {
+    "id": "vitesse-light-light",
+    "name": "Vitesse Light",
+    "description": "Converted from VS Code theme",
+    "version": "1.0.0",
+    "variant": "light",
+    "tags": [
+      "light",
+      "converted",
+      "vscode"
+    ]
+  },
+  "colors": {
+    "primary": {
+      "base": "#1c6b48",
+      "hover": "#1c6b48",
+      "active": "#228056",
+      "foreground": "#ffffff",
+      "muted": "#1c6b4880",
+      "emphasis": "#248b5e"
+    },
+    "surface": {
+      "background": "#ffffff",
+      "foreground": "#2c2c28",
+      "muted": "#ecebeb",
+      "mutedForeground": "#43443dcb",
+      "elevated": "#f7f7f7",
+      "elevatedForeground": "#393a34",
+      "overlay": "#ffffff80",
+      "subtle": "#ecebeb"
+    },
+    "interactive": {
+      "border": "#dbd7d7",
+      "borderHover": "#cbc7c7",
+      "borderFocus": "#00000013",
+      "selection": "#22222218",
+      "selectionForeground": "#393a34",
+      "focus": "#00000000",
+      "focusRing": "#0000000050",
+      "cursor": "#CECDC3",
+      "hover": "#22222218",
+      "active": "#22222218"
+    },
+    "status": {
+      "error": "#ab5959",
+      "errorForeground": "#ffffff",
+      "errorBackground": "#ab595920",
+      "errorBorder": "#ab595950",
+      "warning": "#a65e2b",
+      "warningForeground": "#ffffff",
+      "warningBackground": "#a65e2b20",
+      "warningBorder": "#a65e2b50",
+      "success": "#1e754f",
+      "successForeground": "#ffffff",
+      "successBackground": "#1e754f20",
+      "successBorder": "#1e754f50",
+      "info": "#296aa3",
+      "infoForeground": "#ffffff",
+      "infoBackground": "#296aa320",
+      "infoBorder": "#296aa350"
+    },
+    "syntax": {
+      "base": {
+        "background": "#ffffff",
+        "foreground": "#393a34",
+        "comment": "#a0ada0",
+        "keyword": "#1e754f",
+        "string": "#b56959",
+        "number": "#2f798a",
+        "function": "#59873a",
+        "variable": "#b07d48",
+        "type": "#2e808f",
+        "operator": "#ab5959"
+      },
+      "tokens": {
+        "commentDoc": "#575653",
+        "stringEscape": "#393a34",
+        "keywordImport": "#D14D41",
+        "storageModifier": "#4385BE",
+        "functionCall": "#59873a",
+        "method": "#879A39",
+        "variableProperty": "#998418",
+        "variableOther": "#879A39",
+        "class": "#5a6aa6",
+        "className": "#5a6aa6",
+        "interface": "#2e808f",
+        "tag": "#1e754f",
+        "boolean": "#1e754f",
+        "url": "#b56959",
+        "key": "#998418"
+      },
+      "highlights": {
+        "diffAdded": "#1e754f",
+        "diffAddedBackground": "#1e754f20",
+        "diffRemoved": "#ab5959",
+        "diffRemovedBackground": "#ab595920",
+        "lineNumber": "#393a3450",
+        "lineNumberActive": "#4e4f47"
+      }
+    },
+    "markdown": {
+      "heading1": "#2c2c28",
+      "heading2": "#2c2c28",
+      "heading3": "#2c2c28",
+      "heading4": "#2c2c28",
+      "link": "#1e754f",
+      "linkHover": "#1c6b48",
+      "inlineCode": "#3a631e",
+      "inlineCodeBackground": "#f7f3f395",
+      "blockquote": "#2c2c2850",
+      "blockquoteBorder": "#00000015",
+      "listMarker": "#1c6b4899"
+    },
+    "chat": {
+      "userMessage": "#2c2c28",
+      "userMessageBackground": "#f4f1f1",
+      "assistantMessage": "#393a34",
+      "assistantMessageBackground": "#ffffff",
+      "timestamp": "#393a3450",
+      "divider": "#00000015"
+    },
+    "tools": {
+      "background": "#ffffff50",
+      "border": "#dbd7d7",
+      "headerHover": "#0000001550",
+      "icon": "#21221e86",
+      "title": "#393a34",
+      "description": "#404139b6",
+      "edit": {
+        "added": "#1e754f",
+        "addedBackground": "#1e754f20",
+        "removed": "#ab5959",
+        "removedBackground": "#ab595920",
+        "lineNumber": "#b9b6b6"
+      }
+    }
+  },
+  "config": {
+    "fonts": {
+      "sans": "\"IBM Plex Mono\", monospace",
+      "mono": "\"IBM Plex Mono\", monospace",
+      "heading": "\"IBM Plex Mono\", monospace"
+    },
+    "radius": {
+      "none": "0",
+      "sm": "0.125rem",
+      "md": "0.375rem",
+      "lg": "0.5rem",
+      "xl": "0.75rem",
+      "full": "9999px"
+    },
+    "transitions": {
+      "fast": "150ms ease",
+      "normal": "250ms ease",
+      "slow": "350ms ease"
+    }
+  }
+}