diff --git a/packages/opencode/src/cli/cmd/tui/context/theme/aura.json b/packages/opencode/src/cli/cmd/tui/context/theme/aura.json
index e7798d52033..47bf5e4d810 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme/aura.json
+++ b/packages/opencode/src/cli/cmd/tui/context/theme/aura.json
@@ -12,58 +12,70 @@
     "red": "#ff6767",
     "orange": "#ffca85",
     "cyan": "#61ffca",
-    "green": "#9dff65"
+    "green": "#9dff65",
+    "lightBg": "#f9f9fb",
+    "lightBgPanel": "#e9e9ed",
+    "lightBorder": "#d4d4d8",
+    "lightFgMuted": "#8e8e96",
+    "lightFg": "#18121e",
+    "lightPurple": "#6940a5",
+    "lightPink": "#ad3da8",
+    "lightBlue": "#2a7fc2",
+    "lightRed": "#cf222e",
+    "lightOrange": "#bc4c00",
+    "lightCyan": "#0969da",
+    "lightGreen": "#1a7f37"
   },
   "theme": {
-    "primary": "purple",
-    "secondary": "pink",
-    "accent": "purple",
-    "error": "red",
-    "warning": "orange",
-    "success": "cyan",
-    "info": "purple",
-    "text": "darkFg",
-    "textMuted": "darkFgMuted",
-    "background": "darkBg",
-    "backgroundPanel": "darkBgPanel",
-    "backgroundElement": "darkBgPanel",
-    "border": "darkBorder",
-    "borderActive": "darkFgMuted",
-    "borderSubtle": "darkBorder",
-    "diffAdded": "cyan",
-    "diffRemoved": "red",
-    "diffContext": "darkFgMuted",
-    "diffHunkHeader": "darkFgMuted",
-    "diffHighlightAdded": "cyan",
-    "diffHighlightRemoved": "red",
-    "diffAddedBg": "#354933",
-    "diffRemovedBg": "#3f191a",
-    "diffContextBg": "darkBgPanel",
-    "diffLineNumber": "darkBorder",
-    "diffAddedLineNumberBg": "#162620",
-    "diffRemovedLineNumberBg": "#26161a",
-    "markdownText": "darkFg",
-    "markdownHeading": "purple",
-    "markdownLink": "pink",
-    "markdownLinkText": "purple",
-    "markdownCode": "cyan",
-    "markdownBlockQuote": "darkFgMuted",
-    "markdownEmph": "orange",
-    "markdownStrong": "purple",
-    "markdownHorizontalRule": "darkFgMuted",
-    "markdownListItem": "purple",
-    "markdownListEnumeration": "purple",
-    "markdownImage": "pink",
-    "markdownImageText": "purple",
-    "markdownCodeBlock": "darkFg",
-    "syntaxComment": "darkFgMuted",
-    "syntaxKeyword": "pink",
-    "syntaxFunction": "purple",
-    "syntaxVariable": "purple",
-    "syntaxString": "cyan",
-    "syntaxNumber": "green",
-    "syntaxType": "purple",
-    "syntaxOperator": "pink",
-    "syntaxPunctuation": "darkFg"
+    "primary": { "dark": "purple", "light": "lightPurple" },
+    "secondary": { "dark": "pink", "light": "lightPink" },
+    "accent": { "dark": "purple", "light": "lightPurple" },
+    "error": { "dark": "red", "light": "lightRed" },
+    "warning": { "dark": "orange", "light": "lightOrange" },
+    "success": { "dark": "cyan", "light": "lightCyan" },
+    "info": { "dark": "purple", "light": "lightPurple" },
+    "text": { "dark": "darkFg", "light": "lightFg" },
+    "textMuted": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "background": { "dark": "darkBg", "light": "lightBg" },
+    "backgroundPanel": { "dark": "darkBgPanel", "light": "lightBgPanel" },
+    "backgroundElement": { "dark": "darkBgPanel", "light": "lightBgPanel" },
+    "border": { "dark": "darkBorder", "light": "lightBorder" },
+    "borderActive": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "borderSubtle": { "dark": "darkBorder", "light": "lightBorder" },
+    "diffAdded": { "dark": "cyan", "light": "lightCyan" },
+    "diffRemoved": { "dark": "red", "light": "lightRed" },
+    "diffContext": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "diffHunkHeader": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "diffHighlightAdded": { "dark": "cyan", "light": "lightCyan" },
+    "diffHighlightRemoved": { "dark": "red", "light": "lightRed" },
+    "diffAddedBg": { "dark": "#354933", "light": "#dafbe1" },
+    "diffRemovedBg": { "dark": "#3f191a", "light": "#ffebe9" },
+    "diffContextBg": { "dark": "darkBgPanel", "light": "lightBgPanel" },
+    "diffLineNumber": { "dark": "darkBorder", "light": "lightBorder" },
+    "diffAddedLineNumberBg": { "dark": "#162620", "light": "#d4fdd4" },
+    "diffRemovedLineNumberBg": { "dark": "#26161a", "light": "#ffddd9" },
+    "markdownText": { "dark": "darkFg", "light": "lightFg" },
+    "markdownHeading": { "dark": "purple", "light": "lightPurple" },
+    "markdownLink": { "dark": "pink", "light": "lightPink" },
+    "markdownLinkText": { "dark": "purple", "light": "lightPurple" },
+    "markdownCode": { "dark": "cyan", "light": "lightCyan" },
+    "markdownBlockQuote": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "markdownEmph": { "dark": "orange", "light": "lightOrange" },
+    "markdownStrong": { "dark": "purple", "light": "lightPurple" },
+    "markdownHorizontalRule": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "markdownListItem": { "dark": "purple", "light": "lightPurple" },
+    "markdownListEnumeration": { "dark": "purple", "light": "lightPurple" },
+    "markdownImage": { "dark": "pink", "light": "lightPink" },
+    "markdownImageText": { "dark": "purple", "light": "lightPurple" },
+    "markdownCodeBlock": { "dark": "darkFg", "light": "lightFg" },
+    "syntaxComment": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "syntaxKeyword": { "dark": "pink", "light": "lightPink" },
+    "syntaxFunction": { "dark": "purple", "light": "lightPurple" },
+    "syntaxVariable": { "dark": "purple", "light": "lightPurple" },
+    "syntaxString": { "dark": "cyan", "light": "lightCyan" },
+    "syntaxNumber": { "dark": "green", "light": "lightGreen" },
+    "syntaxType": { "dark": "purple", "light": "lightPurple" },
+    "syntaxOperator": { "dark": "pink", "light": "lightPink" },
+    "syntaxPunctuation": { "dark": "darkFg", "light": "lightFg" }
   }
 }
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme/ayu.json b/packages/opencode/src/cli/cmd/tui/context/theme/ayu.json
index a42fce4c4e3..4fb884adbba 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme/ayu.json
+++ b/packages/opencode/src/cli/cmd/tui/context/theme/ayu.json
@@ -23,58 +23,81 @@
     "darkRemoved": "#F26D78",
     "darkAccent": "#E6B450",
     "darkError": "#D95757",
-    "darkIndentActive": "#6C7380"
+    "darkIndentActive": "#6C7380",
+    "lightBg": "#fafafa",
+    "lightBgAlt": "#f0f0f0",
+    "lightLine": "#e8e8e8",
+    "lightPanel": "#f5f5f5",
+    "lightFg": "#575d66",
+    "lightFgMuted": "#8a8a8a",
+    "lightGutter": "#b8b8b8",
+    "lightTag": "#0999b9",
+    "lightFunc": "#dc8f2e",
+    "lightEntity": "#2a7fc2",
+    "lightString": "#8ab228",
+    "lightRegexp": "#3b9c7c",
+    "lightMarkup": "#d74957",
+    "lightKeyword": "#f38f2e",
+    "lightSpecial": "#c49030",
+    "lightComment": "#788292",
+    "lightConstant": "#a37acc",
+    "lightOperator": "#c97a3a",
+    "lightAdded": "#5aa728",
+    "lightRemoved": "#d73a4b",
+    "lightAccent": "#c49030",
+    "lightError": "#d73a4b",
+    "lightIndentActive": "#b8b8b8"
   },
   "theme": {
-    "primary": "darkEntity",
-    "secondary": "darkConstant",
-    "accent": "darkAccent",
-    "error": "darkError",
-    "warning": "darkSpecial",
-    "success": "darkAdded",
-    "info": "darkTag",
-    "text": "darkFg",
-    "textMuted": "darkFgMuted",
-    "background": "darkBg",
-    "backgroundPanel": "darkPanel",
-    "backgroundElement": "darkBgAlt",
-    "border": "darkGutter",
-    "borderActive": "darkIndentActive",
-    "borderSubtle": "darkLine",
-    "diffAdded": "darkAdded",
-    "diffRemoved": "darkRemoved",
-    "diffContext": "darkComment",
-    "diffHunkHeader": "darkComment",
-    "diffHighlightAdded": "darkString",
-    "diffHighlightRemoved": "darkMarkup",
-    "diffAddedBg": "#20303b",
-    "diffRemovedBg": "#37222c",
-    "diffContextBg": "darkPanel",
-    "diffLineNumber": "darkGutter",
-    "diffAddedLineNumberBg": "#1b2b34",
-    "diffRemovedLineNumberBg": "#2d1f26",
-    "markdownText": "darkFg",
-    "markdownHeading": "darkConstant",
-    "markdownLink": "darkEntity",
-    "markdownLinkText": "darkTag",
-    "markdownCode": "darkString",
-    "markdownBlockQuote": "darkSpecial",
-    "markdownEmph": "darkSpecial",
-    "markdownStrong": "darkFunc",
-    "markdownHorizontalRule": "darkFgMuted",
-    "markdownListItem": "darkEntity",
-    "markdownListEnumeration": "darkTag",
-    "markdownImage": "darkEntity",
-    "markdownImageText": "darkTag",
-    "markdownCodeBlock": "darkFg",
-    "syntaxComment": "darkComment",
-    "syntaxKeyword": "darkKeyword",
-    "syntaxFunction": "darkFunc",
-    "syntaxVariable": "darkEntity",
-    "syntaxString": "darkString",
-    "syntaxNumber": "darkConstant",
-    "syntaxType": "darkSpecial",
-    "syntaxOperator": "darkOperator",
-    "syntaxPunctuation": "darkFg"
+    "primary": { "dark": "darkEntity", "light": "lightEntity" },
+    "secondary": { "dark": "darkConstant", "light": "lightConstant" },
+    "accent": { "dark": "darkAccent", "light": "lightAccent" },
+    "error": { "dark": "darkError", "light": "lightError" },
+    "warning": { "dark": "darkSpecial", "light": "lightSpecial" },
+    "success": { "dark": "darkAdded", "light": "lightAdded" },
+    "info": { "dark": "darkTag", "light": "lightTag" },
+    "text": { "dark": "darkFg", "light": "lightFg" },
+    "textMuted": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "background": { "dark": "darkBg", "light": "lightBg" },
+    "backgroundPanel": { "dark": "darkPanel", "light": "lightPanel" },
+    "backgroundElement": { "dark": "darkBgAlt", "light": "lightBgAlt" },
+    "border": { "dark": "darkGutter", "light": "lightGutter" },
+    "borderActive": { "dark": "darkIndentActive", "light": "lightIndentActive" },
+    "borderSubtle": { "dark": "darkLine", "light": "lightLine" },
+    "diffAdded": { "dark": "darkAdded", "light": "lightAdded" },
+    "diffRemoved": { "dark": "darkRemoved", "light": "lightRemoved" },
+    "diffContext": { "dark": "darkComment", "light": "lightComment" },
+    "diffHunkHeader": { "dark": "darkComment", "light": "lightComment" },
+    "diffHighlightAdded": { "dark": "darkString", "light": "lightString" },
+    "diffHighlightRemoved": { "dark": "darkMarkup", "light": "lightMarkup" },
+    "diffAddedBg": { "dark": "#20303b", "light": "#e4f8e4" },
+    "diffRemovedBg": { "dark": "#37222c", "light": "#f8e4e4" },
+    "diffContextBg": { "dark": "darkPanel", "light": "lightPanel" },
+    "diffLineNumber": { "dark": "darkGutter", "light": "lightGutter" },
+    "diffAddedLineNumberBg": { "dark": "#1b2b34", "light": "#d4f0d4" },
+    "diffRemovedLineNumberBg": { "dark": "#2d1f26", "light": "#f0d4d4" },
+    "markdownText": { "dark": "darkFg", "light": "lightFg" },
+    "markdownHeading": { "dark": "darkConstant", "light": "lightConstant" },
+    "markdownLink": { "dark": "darkEntity", "light": "lightEntity" },
+    "markdownLinkText": { "dark": "darkTag", "light": "lightTag" },
+    "markdownCode": { "dark": "darkString", "light": "lightString" },
+    "markdownBlockQuote": { "dark": "darkSpecial", "light": "lightSpecial" },
+    "markdownEmph": { "dark": "darkSpecial", "light": "lightSpecial" },
+    "markdownStrong": { "dark": "darkFunc", "light": "lightFunc" },
+    "markdownHorizontalRule": { "dark": "darkFgMuted", "light": "lightFgMuted" },
+    "markdownListItem": { "dark": "darkEntity", "light": "lightEntity" },
+    "markdownListEnumeration": { "dark": "darkTag", "light": "lightTag" },
+    "markdownImage": { "dark": "darkEntity", "light": "lightEntity" },
+    "markdownImageText": { "dark": "darkTag", "light": "lightTag" },
+    "markdownCodeBlock": { "dark": "darkFg", "light": "lightFg" },
+    "syntaxComment": { "dark": "darkComment", "light": "lightComment" },
+    "syntaxKeyword": { "dark": "darkKeyword", "light": "lightKeyword" },
+    "syntaxFunction": { "dark": "darkFunc", "light": "lightFunc" },
+    "syntaxVariable": { "dark": "darkEntity", "light": "lightEntity" },
+    "syntaxString": { "dark": "darkString", "light": "lightString" },
+    "syntaxNumber": { "dark": "darkConstant", "light": "lightConstant" },
+    "syntaxType": { "dark": "darkSpecial", "light": "lightSpecial" },
+    "syntaxOperator": { "dark": "darkOperator", "light": "lightOperator" },
+    "syntaxPunctuation": { "dark": "darkFg", "light": "lightFg" }
   }
 }
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme/catppuccin-frappe.json b/packages/opencode/src/cli/cmd/tui/context/theme/catppuccin-frappe.json
index 79e56ee9af0..0e38b45c831 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme/catppuccin-frappe.json
+++ b/packages/opencode/src/cli/cmd/tui/context/theme/catppuccin-frappe.json
@@ -26,208 +26,84 @@
     "frappeSurface0": "#414559",
     "frappeBase": "#303446",
     "frappeMantle": "#292c3c",
-    "frappeCrust": "#232634"
+    "frappeCrust": "#232634",
+    "latteRosewater": "#dc8a78",
+    "latteFlamingo": "#dd7871",
+    "lattePink": "#ea76cb",
+    "latteMauve": "#8839ef",
+    "latteRed": "#d20f39",
+    "latteMaroon": "#e64553",
+    "lattePeach": "#fe640b",
+    "latteYellow": "#df8e1d",
+    "latteGreen": "#40a02b",
+    "latteTeal": "#179299",
+    "latteSky": "#04a5e5",
+    "latteSapphire": "#209fb5",
+    "latteBlue": "#1e66f5",
+    "latteLavender": "#7287fd",
+    "latteText": "#4c4f69",
+    "latteSubtext1": "#5c5f77",
+    "latteSubtext0": "#6c6f85",
+    "latteOverlay2": "#7c7f93",
+    "latteOverlay1": "#8c8fa1",
+    "latteOverlay0": "#9ca0b0",
+    "latteSurface2": "#bcc0cc",
+    "latteSurface1": "#ccd0da",
+    "latteSurface0": "#dce0e8",
+    "latteBase": "#eff1f5",
+    "latteMantle": "#e6e9ef",
+    "latteCrust": "#dce0e8"
   },
   "theme": {
-    "primary": {
-      "dark": "frappeBlue",
-      "light": "frappeBlue"
-    },
-    "secondary": {
-      "dark": "frappeMauve",
-      "light": "frappeMauve"
-    },
-    "accent": {
-      "dark": "frappePink",
-      "light": "frappePink"
-    },
-    "error": {
-      "dark": "frappeRed",
-      "light": "frappeRed"
-    },
-    "warning": {
-      "dark": "frappeYellow",
-      "light": "frappeYellow"
-    },
-    "success": {
-      "dark": "frappeGreen",
-      "light": "frappeGreen"
-    },
-    "info": {
-      "dark": "frappeTeal",
-      "light": "frappeTeal"
-    },
-    "text": {
-      "dark": "frappeText",
-      "light": "frappeText"
-    },
-    "textMuted": {
-      "dark": "frappeSubtext1",
-      "light": "frappeSubtext1"
-    },
-    "background": {
-      "dark": "frappeBase",
-      "light": "frappeBase"
-    },
-    "backgroundPanel": {
-      "dark": "frappeMantle",
-      "light": "frappeMantle"
-    },
-    "backgroundElement": {
-      "dark": "frappeCrust",
-      "light": "frappeCrust"
-    },
-    "border": {
-      "dark": "frappeSurface0",
-      "light": "frappeSurface0"
-    },
-    "borderActive": {
-      "dark": "frappeSurface1",
-      "light": "frappeSurface1"
-    },
-    "borderSubtle": {
-      "dark": "frappeSurface2",
-      "light": "frappeSurface2"
-    },
-    "diffAdded": {
-      "dark": "frappeGreen",
-      "light": "frappeGreen"
-    },
-    "diffRemoved": {
-      "dark": "frappeRed",
-      "light": "frappeRed"
-    },
-    "diffContext": {
-      "dark": "frappeOverlay2",
-      "light": "frappeOverlay2"
-    },
-    "diffHunkHeader": {
-      "dark": "frappePeach",
-      "light": "frappePeach"
-    },
-    "diffHighlightAdded": {
-      "dark": "frappeGreen",
-      "light": "frappeGreen"
-    },
-    "diffHighlightRemoved": {
-      "dark": "frappeRed",
-      "light": "frappeRed"
-    },
-    "diffAddedBg": {
-      "dark": "#29342b",
-      "light": "#29342b"
-    },
-    "diffRemovedBg": {
-      "dark": "#3a2a31",
-      "light": "#3a2a31"
-    },
-    "diffContextBg": {
-      "dark": "frappeMantle",
-      "light": "frappeMantle"
-    },
-    "diffLineNumber": {
-      "dark": "frappeSurface1",
-      "light": "frappeSurface1"
-    },
-    "diffAddedLineNumberBg": {
-      "dark": "#223025",
-      "light": "#223025"
-    },
-    "diffRemovedLineNumberBg": {
-      "dark": "#2f242b",
-      "light": "#2f242b"
-    },
-    "markdownText": {
-      "dark": "frappeText",
-      "light": "frappeText"
-    },
-    "markdownHeading": {
-      "dark": "frappeMauve",
-      "light": "frappeMauve"
-    },
-    "markdownLink": {
-      "dark": "frappeBlue",
-      "light": "frappeBlue"
-    },
-    "markdownLinkText": {
-      "dark": "frappeSky",
-      "light": "frappeSky"
-    },
-    "markdownCode": {
-      "dark": "frappeGreen",
-      "light": "frappeGreen"
-    },
-    "markdownBlockQuote": {
-      "dark": "frappeYellow",
-      "light": "frappeYellow"
-    },
-    "markdownEmph": {
-      "dark": "frappeYellow",
-      "light": "frappeYellow"
-    },
-    "markdownStrong": {
-      "dark": "frappePeach",
-      "light": "frappePeach"
-    },
-    "markdownHorizontalRule": {
-      "dark": "frappeSubtext0",
-      "light": "frappeSubtext0"
-    },
-    "markdownListItem": {
-      "dark": "frappeBlue",
-      "light": "frappeBlue"
-    },
-    "markdownListEnumeration": {
-      "dark": "frappeSky",
-      "light": "frappeSky"
-    },
-    "markdownImage": {
-      "dark": "frappeBlue",
-      "light": "frappeBlue"
-    },
-    "markdownImageText": {
-      "dark": "frappeSky",
-      "light": "frappeSky"
-    },
-    "markdownCodeBlock": {
-      "dark": "frappeText",
-      "light": "frappeText"
-    },
-    "syntaxComment": {
-      "dark": "frappeOverlay2",
-      "light": "frappeOverlay2"
-    },
-    "syntaxKeyword": {
-      "dark": "frappeMauve",
-      "light": "frappeMauve"
-    },
-    "syntaxFunction": {
-      "dark": "frappeBlue",
-      "light": "frappeBlue"
-    },
-    "syntaxVariable": {
-      "dark": "frappeRed",
-      "light": "frappeRed"
-    },
-    "syntaxString": {
-      "dark": "frappeGreen",
-      "light": "frappeGreen"
-    },
-    "syntaxNumber": {
-      "dark": "frappePeach",
-      "light": "frappePeach"
-    },
-    "syntaxType": {
-      "dark": "frappeYellow",
-      "light": "frappeYellow"
-    },
-    "syntaxOperator": {
-      "dark": "frappeSky",
-      "light": "frappeSky"
-    },
-    "syntaxPunctuation": {
-      "dark": "frappeText",
-      "light": "frappeText"
-    }
+    "primary": { "dark": "frappeBlue", "light": "latteBlue" },
+    "secondary": { "dark": "frappeMauve", "light": "latteMauve" },
+    "accent": { "dark": "frappePink", "light": "lattePink" },
+    "error": { "dark": "frappeRed", "light": "latteRed" },
+    "warning": { "dark": "frappeYellow", "light": "latteYellow" },
+    "success": { "dark": "frappeGreen", "light": "latteGreen" },
+    "info": { "dark": "frappeTeal", "light": "latteTeal" },
+    "text": { "dark": "frappeText", "light": "latteText" },
+    "textMuted": { "dark": "frappeSubtext1", "light": "latteSubtext1" },
+    "background": { "dark": "frappeBase", "light": "latteBase" },
+    "backgroundPanel": { "dark": "frappeMantle", "light": "latteMantle" },
+    "backgroundElement": { "dark": "frappeCrust", "light": "latteCrust" },
+    "border": { "dark": "frappeSurface0", "light": "latteSurface0" },
+    "borderActive": { "dark": "frappeSurface1", "light": "latteSurface1" },
+    "borderSubtle": { "dark": "frappeSurface2", "light": "latteSurface2" },
+    "diffAdded": { "dark": "frappeGreen", "light": "latteGreen" },
+    "diffRemoved": { "dark": "frappeRed", "light": "latteRed" },
+    "diffContext": { "dark": "frappeOverlay2", "light": "latteOverlay2" },
+    "diffHunkHeader": { "dark": "frappePeach", "light": "lattePeach" },
+    "diffHighlightAdded": { "dark": "frappeGreen", "light": "latteGreen" },
+    "diffHighlightRemoved": { "dark": "frappeRed", "light": "latteRed" },
+    "diffAddedBg": { "dark": "#29342b", "light": "#d4f8d4" },
+    "diffRemovedBg": { "dark": "#3a2a31", "light": "#f8d4d4" },
+    "diffContextBg": { "dark": "frappeMantle", "light": "latteMantle" },
+    "diffLineNumber": { "dark": "frappeSurface1", "light": "latteSurface1" },
+    "diffAddedLineNumberBg": { "dark": "#223025", "light": "#c8f0c8" },
+    "diffRemovedLineNumberBg": { "dark": "#2f242b", "light": "#f0c8c8" },
+    "markdownText": { "dark": "frappeText", "light": "latteText" },
+    "markdownHeading": { "dark": "frappeMauve", "light": "latteMauve" },
+    "markdownLink": { "dark": "frappeBlue", "light": "latteBlue" },
+    "markdownLinkText": { "dark": "frappeSky", "light": "latteSky" },
+    "markdownCode": { "dark": "frappeGreen", "light": "latteGreen" },
+    "markdownBlockQuote": { "dark": "frappeYellow", "light": "latteYellow" },
+    "markdownEmph": { "dark": "frappeYellow", "light": "latteYellow" },
+    "markdownStrong": { "dark": "frappePeach", "light": "lattePeach" },
+    "markdownHorizontalRule": { "dark": "frappeSubtext0", "light": "latteSubtext0" },
+    "markdownListItem": { "dark": "frappeBlue", "light": "latteBlue" },
+    "markdownListEnumeration": { "dark": "frappeSky", "light": "latteSky" },
+    "markdownImage": { "dark": "frappeBlue", "light": "latteBlue" },
+    "markdownImageText": { "dark": "frappeSky", "light": "latteSky" },
+    "markdownCodeBlock": { "dark": "frappeText", "light": "latteText" },
+    "syntaxComment": { "dark": "frappeOverlay2", "light": "latteOverlay2" },
+    "syntaxKeyword": { "dark": "frappeMauve", "light": "latteMauve" },
+    "syntaxFunction": { "dark": "frappeBlue", "light": "latteBlue" },
+    "syntaxVariable": { "dark": "frappeRed", "light": "latteRed" },
+    "syntaxString": { "dark": "frappeGreen", "light": "latteGreen" },
+    "syntaxNumber": { "dark": "frappePeach", "light": "lattePeach" },
+    "syntaxType": { "dark": "frappeYellow", "light": "latteYellow" },
+    "syntaxOperator": { "dark": "frappeSky", "light": "latteSky" },
+    "syntaxPunctuation": { "dark": "frappeText", "light": "latteText" }
   }
 }
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme/catppuccin-macchiato.json b/packages/opencode/src/cli/cmd/tui/context/theme/catppuccin-macchiato.json
index 6d9827dfe87..051b6632d0a 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme/catppuccin-macchiato.json
+++ b/packages/opencode/src/cli/cmd/tui/context/theme/catppuccin-macchiato.json
@@ -26,208 +26,84 @@
     "macSurface0": "#363a4f",
     "macBase": "#24273a",
     "macMantle": "#1e2030",
-    "macCrust": "#181926"
+    "macCrust": "#181926",
+    "latteRosewater": "#dc8a78",
+    "latteFlamingo": "#dd7871",
+    "lattePink": "#ea76cb",
+    "latteMauve": "#8839ef",
+    "latteRed": "#d20f39",
+    "latteMaroon": "#e64553",
+    "lattePeach": "#fe640b",
+    "latteYellow": "#df8e1d",
+    "latteGreen": "#40a02b",
+    "latteTeal": "#179299",
+    "latteSky": "#04a5e5",
+    "latteSapphire": "#209fb5",
+    "latteBlue": "#1e66f5",
+    "latteLavender": "#7287fd",
+    "latteText": "#4c4f69",
+    "latteSubtext1": "#5c5f77",
+    "latteSubtext0": "#6c6f85",
+    "latteOverlay2": "#7c7f93",
+    "latteOverlay1": "#8c8fa1",
+    "latteOverlay0": "#9ca0b0",
+    "latteSurface2": "#bcc0cc",
+    "latteSurface1": "#ccd0da",
+    "latteSurface0": "#dce0e8",
+    "latteBase": "#eff1f5",
+    "latteMantle": "#e6e9ef",
+    "latteCrust": "#dce0e8"
   },
   "theme": {
-    "primary": {
-      "dark": "macBlue",
-      "light": "macBlue"
-    },
-    "secondary": {
-      "dark": "macMauve",
-      "light": "macMauve"
-    },
-    "accent": {
-      "dark": "macPink",
-      "light": "macPink"
-    },
-    "error": {
-      "dark": "macRed",
-      "light": "macRed"
-    },
-    "warning": {
-      "dark": "macYellow",
-      "light": "macYellow"
-    },
-    "success": {
-      "dark": "macGreen",
-      "light": "macGreen"
-    },
-    "info": {
-      "dark": "macTeal",
-      "light": "macTeal"
-    },
-    "text": {
-      "dark": "macText",
-      "light": "macText"
-    },
-    "textMuted": {
-      "dark": "macSubtext1",
-      "light": "macSubtext1"
-    },
-    "background": {
-      "dark": "macBase",
-      "light": "macBase"
-    },
-    "backgroundPanel": {
-      "dark": "macMantle",
-      "light": "macMantle"
-    },
-    "backgroundElement": {
-      "dark": "macCrust",
-      "light": "macCrust"
-    },
-    "border": {
-      "dark": "macSurface0",
-      "light": "macSurface0"
-    },
-    "borderActive": {
-      "dark": "macSurface1",
-      "light": "macSurface1"
-    },
-    "borderSubtle": {
-      "dark": "macSurface2",
-      "light": "macSurface2"
-    },
-    "diffAdded": {
-      "dark": "macGreen",
-      "light": "macGreen"
-    },
-    "diffRemoved": {
-      "dark": "macRed",
-      "light": "macRed"
-    },
-    "diffContext": {
-      "dark": "macOverlay2",
-      "light": "macOverlay2"
-    },
-    "diffHunkHeader": {
-      "dark": "macPeach",
-      "light": "macPeach"
-    },
-    "diffHighlightAdded": {
-      "dark": "macGreen",
-      "light": "macGreen"
-    },
-    "diffHighlightRemoved": {
-      "dark": "macRed",
-      "light": "macRed"
-    },
-    "diffAddedBg": {
-      "dark": "#29342b",
-      "light": "#29342b"
-    },
-    "diffRemovedBg": {
-      "dark": "#3a2a31",
-      "light": "#3a2a31"
-    },
-    "diffContextBg": {
-      "dark": "macMantle",
-      "light": "macMantle"
-    },
-    "diffLineNumber": {
-      "dark": "macSurface1",
-      "light": "macSurface1"
-    },
-    "diffAddedLineNumberBg": {
-      "dark": "#223025",
-      "light": "#223025"
-    },
-    "diffRemovedLineNumberBg": {
-      "dark": "#2f242b",
-      "light": "#2f242b"
-    },
-    "markdownText": {
-      "dark": "macText",
-      "light": "macText"
-    },
-    "markdownHeading": {
-      "dark": "macMauve",
-      "light": "macMauve"
-    },
-    "markdownLink": {
-      "dark": "macBlue",
-      "light": "macBlue"
-    },
-    "markdownLinkText": {
-      "dark": "macSky",
-      "light": "macSky"
-    },
-    "markdownCode": {
-      "dark": "macGreen",
-      "light": "macGreen"
-    },
-    "markdownBlockQuote": {
-      "dark": "macYellow",
-      "light": "macYellow"
-    },
-    "markdownEmph": {
-      "dark": "macYellow",
-      "light": "macYellow"
-    },
-    "markdownStrong": {
-      "dark": "macPeach",
-      "light": "macPeach"
-    },
-    "markdownHorizontalRule": {
-      "dark": "macSubtext0",
-      "light": "macSubtext0"
-    },
-    "markdownListItem": {
-      "dark": "macBlue",
-      "light": "macBlue"
-    },
-    "markdownListEnumeration": {
-      "dark": "macSky",
-      "light": "macSky"
-    },
-    "markdownImage": {
-      "dark": "macBlue",
-      "light": "macBlue"
-    },
-    "markdownImageText": {
-      "dark": "macSky",
-      "light": "macSky"
-    },
-    "markdownCodeBlock": {
-      "dark": "macText",
-      "light": "macText"
-    },
-    "syntaxComment": {
-      "dark": "macOverlay2",
-      "light": "macOverlay2"
-    },
-    "syntaxKeyword": {
-      "dark": "macMauve",
-      "light": "macMauve"
-    },
-    "syntaxFunction": {
-      "dark": "macBlue",
-      "light": "macBlue"
-    },
-    "syntaxVariable": {
-      "dark": "macRed",
-      "light": "macRed"
-    },
-    "syntaxString": {
-      "dark": "macGreen",
-      "light": "macGreen"
-    },
-    "syntaxNumber": {
-      "dark": "macPeach",
-      "light": "macPeach"
-    },
-    "syntaxType": {
-      "dark": "macYellow",
-      "light": "macYellow"
-    },
-    "syntaxOperator": {
-      "dark": "macSky",
-      "light": "macSky"
-    },
-    "syntaxPunctuation": {
-      "dark": "macText",
-      "light": "macText"
-    }
+    "primary": { "dark": "macBlue", "light": "latteBlue" },
+    "secondary": { "dark": "macMauve", "light": "latteMauve" },
+    "accent": { "dark": "macPink", "light": "lattePink" },
+    "error": { "dark": "macRed", "light": "latteRed" },
+    "warning": { "dark": "macYellow", "light": "latteYellow" },
+    "success": { "dark": "macGreen", "light": "latteGreen" },
+    "info": { "dark": "macTeal", "light": "latteTeal" },
+    "text": { "dark": "macText", "light": "latteText" },
+    "textMuted": { "dark": "macSubtext1", "light": "latteSubtext1" },
+    "background": { "dark": "macBase", "light": "latteBase" },
+    "backgroundPanel": { "dark": "macMantle", "light": "latteMantle" },
+    "backgroundElement": { "dark": "macCrust", "light": "latteCrust" },
+    "border": { "dark": "macSurface0", "light": "latteSurface0" },
+    "borderActive": { "dark": "macSurface1", "light": "latteSurface1" },
+    "borderSubtle": { "dark": "macSurface2", "light": "latteSurface2" },
+    "diffAdded": { "dark": "macGreen", "light": "latteGreen" },
+    "diffRemoved": { "dark": "macRed", "light": "latteRed" },
+    "diffContext": { "dark": "macOverlay2", "light": "latteOverlay2" },
+    "diffHunkHeader": { "dark": "macPeach", "light": "lattePeach" },
+    "diffHighlightAdded": { "dark": "macGreen", "light": "latteGreen" },
+    "diffHighlightRemoved": { "dark": "macRed", "light": "latteRed" },
+    "diffAddedBg": { "dark": "#29342b", "light": "#d4f8d4" },
+    "diffRemovedBg": { "dark": "#3a2a31", "light": "#f8d4d4" },
+    "diffContextBg": { "dark": "macMantle", "light": "latteMantle" },
+    "diffLineNumber": { "dark": "macSurface1", "light": "latteSurface1" },
+    "diffAddedLineNumberBg": { "dark": "#223025", "light": "#c8f0c8" },
+    "diffRemovedLineNumberBg": { "dark": "#2f242b", "light": "#f0c8c8" },
+    "markdownText": { "dark": "macText", "light": "latteText" },
+    "markdownHeading": { "dark": "macMauve", "light": "latteMauve" },
+    "markdownLink": { "dark": "macBlue", "light": "latteBlue" },
+    "markdownLinkText": { "dark": "macSky", "light": "latteSky" },
+    "markdownCode": { "dark": "macGreen", "light": "latteGreen" },
+    "markdownBlockQuote": { "dark": "macYellow", "light": "latteYellow" },
+    "markdownEmph": { "dark": "macYellow", "light": "latteYellow" },
+    "markdownStrong": { "dark": "macPeach", "light": "lattePeach" },
+    "markdownHorizontalRule": { "dark": "macSubtext0", "light": "latteSubtext0" },
+    "markdownListItem": { "dark": "macBlue", "light": "latteBlue" },
+    "markdownListEnumeration": { "dark": "macSky", "light": "latteSky" },
+    "markdownImage": { "dark": "macBlue", "light": "latteBlue" },
+    "markdownImageText": { "dark": "macSky", "light": "latteSky" },
+    "markdownCodeBlock": { "dark": "macText", "light": "latteText" },
+    "syntaxComment": { "dark": "macOverlay2", "light": "latteOverlay2" },
+    "syntaxKeyword": { "dark": "macMauve", "light": "latteMauve" },
+    "syntaxFunction": { "dark": "macBlue", "light": "latteBlue" },
+    "syntaxVariable": { "dark": "macRed", "light": "latteRed" },
+    "syntaxString": { "dark": "macGreen", "light": "latteGreen" },
+    "syntaxNumber": { "dark": "macPeach", "light": "lattePeach" },
+    "syntaxType": { "dark": "macYellow", "light": "latteYellow" },
+    "syntaxOperator": { "dark": "macSky", "light": "latteSky" },
+    "syntaxPunctuation": { "dark": "macText", "light": "latteText" }
   }
 }
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme/nightowl.json b/packages/opencode/src/cli/cmd/tui/context/theme/nightowl.json
index 24c74733dd0..162e2ad4788 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme/nightowl.json
+++ b/packages/opencode/src/cli/cmd/tui/context/theme/nightowl.json
@@ -14,208 +14,71 @@
     "nightOwlMuted": "#5f7e97",
     "nightOwlGray": "#637777",
     "nightOwlLightGray": "#89a4bb",
-    "nightOwlPanel": "#0b253a"
+    "nightOwlPanel": "#0b253a",
+    "nightOwlLightBg": "#f8f9fa",
+    "nightOwlLightFg": "#403f53",
+    "nightOwlLightBlue": "#4876d6",
+    "nightOwlLightCyan": "#3b8b94",
+    "nightOwlLightGreen": "#2aa298",
+    "nightOwlLightYellow": "#c96765",
+    "nightOwlLightOrange": "#c25f25",
+    "nightOwlLightRed": "#de3d3b",
+    "nightOwlLightPink": "#aa0982",
+    "nightOwlLightPurple": "#994cc3",
+    "nightOwlLightMuted": "#8b8b8b",
+    "nightOwlLightGray2": "#6d6d6d",
+    "nightOwlLightPanel": "#eef0f2"
   },
   "theme": {
-    "primary": {
-      "dark": "nightOwlBlue",
-      "light": "nightOwlBlue"
-    },
-    "secondary": {
-      "dark": "nightOwlCyan",
-      "light": "nightOwlCyan"
-    },
-    "accent": {
-      "dark": "nightOwlPurple",
-      "light": "nightOwlPurple"
-    },
-    "error": {
-      "dark": "nightOwlRed",
-      "light": "nightOwlRed"
-    },
-    "warning": {
-      "dark": "nightOwlYellow",
-      "light": "nightOwlYellow"
-    },
-    "success": {
-      "dark": "nightOwlGreen",
-      "light": "nightOwlGreen"
-    },
-    "info": {
-      "dark": "nightOwlBlue",
-      "light": "nightOwlBlue"
-    },
-    "text": {
-      "dark": "nightOwlFg",
-      "light": "nightOwlFg"
-    },
-    "textMuted": {
-      "dark": "nightOwlMuted",
-      "light": "nightOwlMuted"
-    },
-    "background": {
-      "dark": "nightOwlBg",
-      "light": "nightOwlBg"
-    },
-    "backgroundPanel": {
-      "dark": "nightOwlPanel",
-      "light": "nightOwlPanel"
-    },
-    "backgroundElement": {
-      "dark": "nightOwlPanel",
-      "light": "nightOwlPanel"
-    },
-    "border": {
-      "dark": "nightOwlMuted",
-      "light": "nightOwlMuted"
-    },
-    "borderActive": {
-      "dark": "nightOwlBlue",
-      "light": "nightOwlBlue"
-    },
-    "borderSubtle": {
-      "dark": "nightOwlMuted",
-      "light": "nightOwlMuted"
-    },
-    "diffAdded": {
-      "dark": "nightOwlGreen",
-      "light": "nightOwlGreen"
-    },
-    "diffRemoved": {
-      "dark": "nightOwlRed",
-      "light": "nightOwlRed"
-    },
-    "diffContext": {
-      "dark": "nightOwlMuted",
-      "light": "nightOwlMuted"
-    },
-    "diffHunkHeader": {
-      "dark": "nightOwlMuted",
-      "light": "nightOwlMuted"
-    },
-    "diffHighlightAdded": {
-      "dark": "nightOwlGreen",
-      "light": "nightOwlGreen"
-    },
-    "diffHighlightRemoved": {
-      "dark": "nightOwlRed",
-      "light": "nightOwlRed"
-    },
-    "diffAddedBg": {
-      "dark": "#0a2e1a",
-      "light": "#0a2e1a"
-    },
-    "diffRemovedBg": {
-      "dark": "#2d1b1b",
-      "light": "#2d1b1b"
-    },
-    "diffContextBg": {
-      "dark": "nightOwlPanel",
-      "light": "nightOwlPanel"
-    },
-    "diffLineNumber": {
-      "dark": "nightOwlMuted",
-      "light": "nightOwlMuted"
-    },
-    "diffAddedLineNumberBg": {
-      "dark": "#0a2e1a",
-      "light": "#0a2e1a"
-    },
-    "diffRemovedLineNumberBg": {
-      "dark": "#2d1b1b",
-      "light": "#2d1b1b"
-    },
-    "markdownText": {
-      "dark": "nightOwlFg",
-      "light": "nightOwlFg"
-    },
-    "markdownHeading": {
-      "dark": "nightOwlBlue",
-      "light": "nightOwlBlue"
-    },
-    "markdownLink": {
-      "dark": "nightOwlCyan",
-      "light": "nightOwlCyan"
-    },
-    "markdownLinkText": {
-      "dark": "nightOwlBlue",
-      "light": "nightOwlBlue"
-    },
-    "markdownCode": {
-      "dark": "nightOwlGreen",
-      "light": "nightOwlGreen"
-    },
-    "markdownBlockQuote": {
-      "dark": "nightOwlMuted",
-      "light": "nightOwlMuted"
-    },
-    "markdownEmph": {
-      "dark": "nightOwlPurple",
-      "light": "nightOwlPurple"
-    },
-    "markdownStrong": {
-      "dark": "nightOwlYellow",
-      "light": "nightOwlYellow"
-    },
-    "markdownHorizontalRule": {
-      "dark": "nightOwlMuted",
-      "light": "nightOwlMuted"
-    },
-    "markdownListItem": {
-      "dark": "nightOwlBlue",
-      "light": "nightOwlBlue"
-    },
-    "markdownListEnumeration": {
-      "dark": "nightOwlCyan",
-      "light": "nightOwlCyan"
-    },
-    "markdownImage": {
-      "dark": "nightOwlCyan",
-      "light": "nightOwlCyan"
-    },
-    "markdownImageText": {
-      "dark": "nightOwlBlue",
-      "light": "nightOwlBlue"
-    },
-    "markdownCodeBlock": {
-      "dark": "nightOwlFg",
-      "light": "nightOwlFg"
-    },
-    "syntaxComment": {
-      "dark": "nightOwlGray",
-      "light": "nightOwlGray"
-    },
-    "syntaxKeyword": {
-      "dark": "nightOwlPurple",
-      "light": "nightOwlPurple"
-    },
-    "syntaxFunction": {
-      "dark": "nightOwlBlue",
-      "light": "nightOwlBlue"
-    },
-    "syntaxVariable": {
-      "dark": "nightOwlFg",
-      "light": "nightOwlFg"
-    },
-    "syntaxString": {
-      "dark": "nightOwlYellow",
-      "light": "nightOwlYellow"
-    },
-    "syntaxNumber": {
-      "dark": "nightOwlOrange",
-      "light": "nightOwlOrange"
-    },
-    "syntaxType": {
-      "dark": "nightOwlGreen",
-      "light": "nightOwlGreen"
-    },
-    "syntaxOperator": {
-      "dark": "nightOwlCyan",
-      "light": "nightOwlCyan"
-    },
-    "syntaxPunctuation": {
-      "dark": "nightOwlFg",
-      "light": "nightOwlFg"
-    }
+    "primary": { "dark": "nightOwlBlue", "light": "nightOwlLightBlue" },
+    "secondary": { "dark": "nightOwlCyan", "light": "nightOwlLightCyan" },
+    "accent": { "dark": "nightOwlPurple", "light": "nightOwlLightPurple" },
+    "error": { "dark": "nightOwlRed", "light": "nightOwlLightRed" },
+    "warning": { "dark": "nightOwlYellow", "light": "nightOwlLightOrange" },
+    "success": { "dark": "nightOwlGreen", "light": "nightOwlLightGreen" },
+    "info": { "dark": "nightOwlBlue", "light": "nightOwlLightBlue" },
+    "text": { "dark": "nightOwlFg", "light": "nightOwlLightFg" },
+    "textMuted": { "dark": "nightOwlMuted", "light": "nightOwlLightMuted" },
+    "background": { "dark": "nightOwlBg", "light": "nightOwlLightBg" },
+    "backgroundPanel": { "dark": "nightOwlPanel", "light": "nightOwlLightPanel" },
+    "backgroundElement": { "dark": "nightOwlPanel", "light": "nightOwlLightPanel" },
+    "border": { "dark": "nightOwlMuted", "light": "nightOwlLightGray2" },
+    "borderActive": { "dark": "nightOwlBlue", "light": "nightOwlLightBlue" },
+    "borderSubtle": { "dark": "nightOwlMuted", "light": "nightOwlLightMuted" },
+    "diffAdded": { "dark": "nightOwlGreen", "light": "nightOwlLightGreen" },
+    "diffRemoved": { "dark": "nightOwlRed", "light": "nightOwlLightRed" },
+    "diffContext": { "dark": "nightOwlMuted", "light": "nightOwlLightMuted" },
+    "diffHunkHeader": { "dark": "nightOwlMuted", "light": "nightOwlLightMuted" },
+    "diffHighlightAdded": { "dark": "nightOwlGreen", "light": "#489447" },
+    "diffHighlightRemoved": { "dark": "nightOwlRed", "light": "#d65145" },
+    "diffAddedBg": { "dark": "#0a2e1a", "light": "#eafbe9" },
+    "diffRemovedBg": { "dark": "#2d1b1b", "light": "#fce9e8" },
+    "diffContextBg": { "dark": "nightOwlPanel", "light": "nightOwlLightPanel" },
+    "diffLineNumber": { "dark": "nightOwlMuted", "light": "nightOwlLightGray2" },
+    "diffAddedLineNumberBg": { "dark": "#0a2e1a", "light": "#e1f3df" },
+    "diffRemovedLineNumberBg": { "dark": "#2d1b1b", "light": "#f5e2e1" },
+    "markdownText": { "dark": "nightOwlFg", "light": "nightOwlLightFg" },
+    "markdownHeading": { "dark": "nightOwlBlue", "light": "nightOwlLightBlue" },
+    "markdownLink": { "dark": "nightOwlCyan", "light": "nightOwlLightCyan" },
+    "markdownLinkText": { "dark": "nightOwlBlue", "light": "nightOwlLightPurple" },
+    "markdownCode": { "dark": "nightOwlGreen", "light": "nightOwlLightGreen" },
+    "markdownBlockQuote": { "dark": "nightOwlMuted", "light": "nightOwlLightMuted" },
+    "markdownEmph": { "dark": "nightOwlPurple", "light": "nightOwlLightPurple" },
+    "markdownStrong": { "dark": "nightOwlYellow", "light": "nightOwlLightOrange" },
+    "markdownHorizontalRule": { "dark": "nightOwlMuted", "light": "nightOwlLightMuted" },
+    "markdownListItem": { "dark": "nightOwlBlue", "light": "nightOwlLightBlue" },
+    "markdownListEnumeration": { "dark": "nightOwlCyan", "light": "nightOwlLightCyan" },
+    "markdownImage": { "dark": "nightOwlCyan", "light": "nightOwlLightCyan" },
+    "markdownImageText": { "dark": "nightOwlBlue", "light": "nightOwlLightPurple" },
+    "markdownCodeBlock": { "dark": "nightOwlFg", "light": "nightOwlLightFg" },
+    "syntaxComment": { "dark": "nightOwlGray", "light": "nightOwlLightGray2" },
+    "syntaxKeyword": { "dark": "nightOwlPurple", "light": "nightOwlLightPurple" },
+    "syntaxFunction": { "dark": "nightOwlBlue", "light": "nightOwlLightBlue" },
+    "syntaxVariable": { "dark": "nightOwlFg", "light": "nightOwlLightFg" },
+    "syntaxString": { "dark": "nightOwlYellow", "light": "#596600" },
+    "syntaxNumber": { "dark": "nightOwlOrange", "light": "nightOwlLightOrange" },
+    "syntaxType": { "dark": "nightOwlGreen", "light": "nightOwlLightGreen" },
+    "syntaxOperator": { "dark": "nightOwlCyan", "light": "nightOwlLightCyan" },
+    "syntaxPunctuation": { "dark": "nightOwlFg", "light": "nightOwlLightFg" }
   }
 }