diff --git a/default/themed/alacritty.toml.tpl b/default/themed/alacritty.toml.tpl
index ff8bc8d..4457a23 100644
--- a/default/themed/alacritty.toml.tpl
+++ b/default/themed/alacritty.toml.tpl
@@ -4,19 +4,19 @@ foreground = "{{ foreground }}"
 
 [colors.cursor]
 text = "{{ background }}"
-cursor = "{{ cursor }}"
+cursor = "{{ bright_foreground }}"
 
 [colors.vi_mode_cursor]
 text = "{{ background }}"
-cursor = "{{ cursor }}"
+cursor = "{{ bright_foreground }}"
 
 [colors.search.matches]
 foreground = "{{ background }}"
-background = "{{ color3 }}"
+background = "{{ yellow }}"
 
 [colors.search.focused_match]
 foreground = "{{ background }}"
-background = "{{ color1 }}"
+background = "{{ red }}"
 
 [colors.footer_bar]
 foreground = "{{ background }}"
@@ -27,21 +27,21 @@ text = "{{ selection_foreground }}"
 background = "{{ selection_background }}"
 
 [colors.normal]
-black = "{{ color0 }}"
-red = "{{ color1 }}"
-green = "{{ color2 }}"
-yellow = "{{ color3 }}"
-blue = "{{ color4 }}"
-magenta = "{{ color5 }}"
-cyan = "{{ color6 }}"
-white = "{{ color7 }}"
+black = "{{ background }}"
+red = "{{ red }}"
+green = "{{ green }}"
+yellow = "{{ yellow }}"
+blue = "{{ blue }}"
+magenta = "{{ magenta }}"
+cyan = "{{ cyan }}"
+white = "{{ foreground }}"
 
 [colors.bright]
-black = "{{ color8 }}"
-red = "{{ color9 }}"
-green = "{{ color10 }}"
-yellow = "{{ color11 }}"
-blue = "{{ color12 }}"
-magenta = "{{ color13 }}"
-cyan = "{{ color14 }}"
-white = "{{ color15 }}"
+black = "{{ muted }}"
+red = "{{ bright_red }}"
+green = "{{ bright_green }}"
+yellow = "{{ bright_yellow }}"
+blue = "{{ bright_blue }}"
+magenta = "{{ bright_magenta }}"
+cyan = "{{ bright_cyan }}"
+white = "{{ bright_foreground }}"
diff --git a/default/themed/btop.theme.tpl b/default/themed/btop.theme.tpl
index 7b1b299..3cc2d77 100644
--- a/default/themed/btop.theme.tpl
+++ b/default/themed/btop.theme.tpl
@@ -11,73 +11,83 @@ theme[title]="{{ foreground }}"
 theme[hi_fg]="{{ accent }}"
 
 # Background color of selected item in processes box
-theme[selected_bg]="{{ color8 }}"
+theme[selected_bg]="{{ selection }}"
 
 # Foreground color of selected item in processes box
 theme[selected_fg]="{{ accent }}"
 
 # Color of inactive/disabled text
-theme[inactive_fg]="{{ color8 }}"
+theme[inactive_fg]="{{ muted }}"
 
 # Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="{{ foreground }}"
+theme[graph_text]="{{ light_foreground }}"
 
 # Background color of the percentage meters
-theme[meter_bg]="{{ color8 }}"
+theme[meter_bg]="{{ selection }}"
 
 # Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="{{ foreground }}"
+theme[proc_misc]="{{ light_foreground }}"
 
 # CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="{{ color5 }}"
-theme[mem_box]="{{ color2 }}"
-theme[net_box]="{{ color1 }}"
+theme[cpu_box]="{{ magenta }}"
+theme[mem_box]="{{ green }}"
+theme[net_box]="{{ red }}"
 theme[proc_box]="{{ accent }}"
 
 # Box divider line and small boxes line color
-theme[div_line]="{{ color8 }}"
+theme[div_line]="{{ muted }}"
 
 # Temperature graph color (Green -> Yellow -> Red)
-theme[temp_start]="{{ color2 }}"
-theme[temp_mid]="{{ color3 }}"
-theme[temp_end]="{{ color1 }}"
+theme[temp_start]="{{ green }}"
+theme[temp_mid]="{{ yellow }}"
+theme[temp_end]="{{ red }}"
 
-# CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="{{ color6 }}"
-theme[cpu_mid]="{{ color4 }}"
-theme[cpu_end]="{{ color5 }}"
+# CPU graph colors (Teal -> Blue -> Magenta)
+theme[cpu_start]="{{ cyan }}"
+theme[cpu_mid]="{{ blue }}"
+theme[cpu_end]="{{ magenta }}"
 
-# Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="{{ color5 }}"
-theme[free_mid]="{{ color4 }}"
-theme[free_end]="{{ color6 }}"
+# Mem/Disk free meter
+theme[free_start]="{{ magenta }}"
+theme[free_mid]="{{ blue }}"
+theme[free_end]="{{ cyan }}"
 
-# Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="{{ color4 }}"
-theme[cached_mid]="{{ color6 }}"
-theme[cached_end]="{{ color5 }}"
+# Mem/Disk cached meter
+theme[cached_start]="{{ blue }}"
+theme[cached_mid]="{{ cyan }}"
+theme[cached_end]="{{ magenta }}"
 
-# Mem/Disk available meter (Peach -> Red)
-theme[available_start]="{{ color3 }}"
-theme[available_mid]="{{ color1 }}"
-theme[available_end]="{{ color1 }}"
+# Mem/Disk available meter
+theme[available_start]="{{ yellow }}"
+theme[available_mid]="{{ red }}"
+theme[available_end]="{{ red }}"
 
-# Mem/Disk used meter (Green -> Sky)
-theme[used_start]="{{ color2 }}"
-theme[used_mid]="{{ color6 }}"
-theme[used_end]="{{ color4 }}"
+# Mem/Disk used meter (Green -> Teal -> Blue)
+theme[used_start]="{{ green }}"
+theme[used_mid]="{{ cyan }}"
+theme[used_end]="{{ blue }}"
 
-# Download graph colors (Peach -> Red)
-theme[download_start]="{{ color3 }}"
-theme[download_mid]="{{ color1 }}"
-theme[download_end]="{{ color1 }}"
+# Download graph colors
+theme[download_start]="{{ yellow }}"
+theme[download_mid]="{{ red }}"
+theme[download_end]="{{ red }}"
 
-# Upload graph colors (Green -> Sky)
-theme[upload_start]="{{ color2 }}"
-theme[upload_mid]="{{ color6 }}"
-theme[upload_end]="{{ color4 }}"
+# Upload graph colors (Green -> Teal -> Blue)
+theme[upload_start]="{{ green }}"
+theme[upload_mid]="{{ cyan }}"
+theme[upload_end]="{{ blue }}"
 
-# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="{{ color6 }}"
-theme[process_mid]="{{ color4 }}"
-theme[process_end]="{{ color5 }}"
+# Process box color gradient for threads, mem and cpu usage
+theme[process_start]="{{ cyan }}"
+theme[process_mid]="{{ blue }}"
+theme[process_end]="{{ magenta }}"
+
+# Graph gradient colors (spectrum shades from background to foreground)
+theme[gradient_color_0]="{{ background }}"
+theme[gradient_color_1]="{{ lighter_background }}"
+theme[gradient_color_2]="{{ selection }}"
+theme[gradient_color_3]="{{ muted }}"
+theme[gradient_color_4]="{{ dark_foreground }}"
+theme[gradient_color_5]="{{ foreground }}"
+theme[gradient_color_6]="{{ light_foreground }}"
+theme[gradient_color_7]="{{ bright_foreground }}"
diff --git a/default/themed/claude.json.tpl b/default/themed/claude.json.tpl
new file mode 100644
index 0000000..61fa9ae
--- /dev/null
+++ b/default/themed/claude.json.tpl
@@ -0,0 +1,43 @@
+{
+  "name": "Omarchy",
+  "base": "{{ theme_type }}",
+  "overrides": {
+    "claude": "{{ accent }}",
+    "claudeShimmer": "{{ mix accent foreground 35% }}",
+    "text": "{{ foreground }}",
+    "inverseText": "{{ background }}",
+    "inactive": "{{ mix foreground background 40% }}",
+    "inactiveShimmer": "{{ mix foreground background 25% }}",
+    "subtle": "{{ muted }}",
+    "suggestion": "{{ cyan }}",
+    "permission": "{{ blue }}",
+    "permissionShimmer": "{{ mix blue foreground 35% }}",
+    "remember": "{{ yellow }}",
+    "success": "{{ green }}",
+    "error": "{{ red }}",
+    "warning": "{{ yellow }}",
+    "warningShimmer": "{{ mix yellow foreground 35% }}",
+    "merged": "{{ magenta }}",
+    "promptBorder": "{{ accent }}",
+    "promptBorderShimmer": "{{ mix accent foreground 35% }}",
+    "planMode": "{{ cyan }}",
+    "autoAccept": "{{ yellow }}",
+    "bashBorder": "{{ bright_yellow }}",
+    "ide": "{{ bright_cyan }}",
+    "diffAdded": "{{ mix background green 15% }}",
+    "diffRemoved": "{{ mix background red 15% }}",
+    "diffAddedDimmed": "{{ mix background green 8% }}",
+    "diffRemovedDimmed": "{{ mix background red 8% }}",
+    "diffAddedWord": "{{ mix background green 32% }}",
+    "diffRemovedWord": "{{ mix background red 32% }}",
+    "userMessageBackground": "{{ mix background foreground 6% }}",
+    "userMessageBackgroundHover": "{{ mix background foreground 10% }}",
+    "bashMessageBackgroundColor": "{{ mix background foreground 6% }}",
+    "memoryBackgroundColor": "{{ mix background foreground 6% }}",
+    "selectionBg": "{{ selection_background }}",
+    "rate_limit_fill": "{{ accent }}",
+    "rate_limit_empty": "{{ mix background foreground 20% }}",
+    "briefLabelYou": "{{ yellow }}",
+    "briefLabelClaude": "{{ accent }}"
+  }
+}
diff --git a/default/themed/foot.ini.tpl b/default/themed/foot.ini.tpl
index c56dc61..a3764b2 100644
--- a/default/themed/foot.ini.tpl
+++ b/default/themed/foot.ini.tpl
@@ -4,22 +4,22 @@ background={{ background_strip }}
 selection-foreground={{ selection_foreground_strip }}
 selection-background={{ selection_background_strip }}
 
-cursor={{ background_strip }} {{ cursor_strip }}
+cursor={{ background_strip }} {{ bright_foreground_strip }}
 
-regular0={{ color0_strip }}
-regular1={{ color1_strip }}
-regular2={{ color2_strip }}
-regular3={{ color3_strip }}
-regular4={{ color4_strip }}
-regular5={{ color5_strip }}
-regular6={{ color6_strip }}
-regular7={{ color7_strip }}
+regular0={{ background_strip }}
+regular1={{ red_strip }}
+regular2={{ green_strip }}
+regular3={{ yellow_strip }}
+regular4={{ blue_strip }}
+regular5={{ purple_strip }}
+regular6={{ cyan_strip }}
+regular7={{ foreground_strip }}
 
-bright0={{ color8_strip }}
-bright1={{ color9_strip }}
-bright2={{ color10_strip }}
-bright3={{ color11_strip }}
-bright4={{ color12_strip }}
-bright5={{ color13_strip }}
-bright6={{ color14_strip }}
-bright7={{ color15_strip }}
+bright0={{ muted_strip }}
+bright1={{ bright_red_strip }}
+bright2={{ bright_green_strip }}
+bright3={{ bright_yellow_strip }}
+bright4={{ bright_blue_strip }}
+bright5={{ bright_magenta_strip }}
+bright6={{ bright_cyan_strip }}
+bright7={{ bright_foreground_strip }}
diff --git a/default/themed/ghostty.conf.tpl b/default/themed/ghostty.conf.tpl
index bafc649..12cd533 100644
--- a/default/themed/ghostty.conf.tpl
+++ b/default/themed/ghostty.conf.tpl
@@ -1,22 +1,22 @@
 background = {{ background }}
 foreground = {{ foreground }}
-cursor-color = {{ cursor }}
+cursor-color = {{ bright_foreground }}
 selection-background = {{ selection_background }}
 selection-foreground = {{ selection_foreground }}
 
-palette = 0={{ color0 }}
-palette = 1={{ color1 }}
-palette = 2={{ color2 }}
-palette = 3={{ color3 }}
-palette = 4={{ color4 }}
-palette = 5={{ color5 }}
-palette = 6={{ color6 }}
-palette = 7={{ color7 }}
-palette = 8={{ color8 }}
-palette = 9={{ color9 }}
-palette = 10={{ color10 }}
-palette = 11={{ color11 }}
-palette = 12={{ color12 }}
-palette = 13={{ color13 }}
-palette = 14={{ color14 }}
-palette = 15={{ color15 }}
+palette = 0={{ background }}
+palette = 1={{ red }}
+palette = 2={{ green }}
+palette = 3={{ yellow }}
+palette = 4={{ blue }}
+palette = 5={{ magenta }}
+palette = 6={{ cyan }}
+palette = 7={{ foreground }}
+palette = 8={{ muted }}
+palette = 9={{ bright_red }}
+palette = 10={{ bright_green }}
+palette = 11={{ bright_yellow }}
+palette = 12={{ bright_blue }}
+palette = 13={{ bright_magenta }}
+palette = 14={{ bright_cyan }}
+palette = 15={{ bright_foreground }}
diff --git a/default/themed/gum_env.lua.tpl b/default/themed/gum_env.lua.tpl
new file mode 100644
index 0000000..81f4c7b
--- /dev/null
+++ b/default/themed/gum_env.lua.tpl
@@ -0,0 +1,137 @@
+-- Gum Style (generic) Variables
+hl.env("FOREGROUND", "{{ foreground }}")
+hl.env("BACKGROUND", "{{ background }}")
+hl.env("BORDER_FOREGROUND", "{{ accent }}")
+hl.env("BORDER_BACKGROUND", "{{ background }}")
+
+-- Gum Confirm Style Variables
+hl.env("GUM_CONFIRM_PROMPT_FOREGROUND", "{{ accent }}")
+hl.env("GUM_CONFIRM_PROMPT_BACKGROUND", "{{ background }}")
+hl.env("GUM_CONFIRM_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_CONFIRM_SELECTED_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_CONFIRM_UNSELECTED_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_CONFIRM_UNSELECTED_BACKGROUND", "{{ background }}")
+
+-- Gum Input Style Variables
+hl.env("GUM_INPUT_PROMPT_FOREGROUND", "{{ accent }}")
+hl.env("GUM_INPUT_PROMPT_BACKGROUND", "{{ background }}")
+hl.env("GUM_INPUT_PLACEHOLDER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_INPUT_PLACEHOLDER_BACKGROUND", "{{ background }}")
+hl.env("GUM_INPUT_CURSOR_FOREGROUND", "{{ bright_foreground }}")
+hl.env("GUM_INPUT_CURSOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_INPUT_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_INPUT_HEADER_BACKGROUND", "{{ background }}")
+
+-- Gum Choose Style Variables
+hl.env("GUM_CHOOSE_CURSOR_FOREGROUND", "{{ accent }}")
+hl.env("GUM_CHOOSE_CURSOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_CHOOSE_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_CHOOSE_HEADER_BACKGROUND", "{{ background }}")
+hl.env("GUM_CHOOSE_ITEM_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_CHOOSE_ITEM_BACKGROUND", "{{ background }}")
+hl.env("GUM_CHOOSE_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_CHOOSE_SELECTED_BACKGROUND", "{{ selection_background }}")
+
+-- Gum Filter Style Variables
+hl.env("GUM_FILTER_PROMPT_FOREGROUND", "{{ accent }}")
+hl.env("GUM_FILTER_PROMPT_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_TEXT_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILTER_TEXT_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_MATCH_FOREGROUND", "{{ accent }}")
+hl.env("GUM_FILTER_CURSOR_TEXT_FOREGROUND", "{{ bright_foreground }}")
+hl.env("GUM_FILTER_CURSOR_TEXT_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_FILTER_SELECTED_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_FILTER_INDICATOR_FOREGROUND", "{{ accent }}")
+hl.env("GUM_FILTER_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILTER_MATCH_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_HEADER_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_PLACEHOLDER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_FILTER_PLACEHOLDER_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_INDICATOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_SELECTED_PREFIX_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_FILTER_SELECTED_PREFIX_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_FILTER_UNSELECTED_PREFIX_FOREGROUND", "{{ muted }}")
+hl.env("GUM_FILTER_UNSELECTED_PREFIX_BACKGROUND", "{{ background }}")
+
+-- Gum Table Style Variables
+hl.env("GUM_TABLE_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_TABLE_HEADER_BACKGROUND", "{{ background }}")
+hl.env("GUM_TABLE_CELL_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_TABLE_CELL_BACKGROUND", "{{ background }}")
+hl.env("GUM_TABLE_BORDER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_TABLE_BORDER_BACKGROUND", "{{ background }}")
+hl.env("GUM_TABLE_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_TABLE_SELECTED_BACKGROUND", "{{ selection_background }}")
+
+-- Gum Spin Style Variables
+hl.env("GUM_SPIN_SPINNER_FOREGROUND", "{{ accent }}")
+hl.env("GUM_SPIN_SPINNER_BACKGROUND", "{{ background }}")
+hl.env("GUM_SPIN_TITLE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_SPIN_TITLE_BACKGROUND", "{{ background }}")
+
+-- Gum File Style Variables
+hl.env("GUM_FILE_CURSOR_FOREGROUND", "{{ bright_foreground }}")
+hl.env("GUM_FILE_CURSOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_SYMLINK_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILE_SYMLINK_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_DIRECTORY_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILE_DIRECTORY_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_FILE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILE_FILE_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_PERMISSIONS_FOREGROUND", "{{ muted }}")
+hl.env("GUM_FILE_PERMISSIONS_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_FILE_SELECTED_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_FILE_FILE_SIZE_FOREGROUND", "{{ muted }}")
+hl.env("GUM_FILE_FILE_SIZE_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILE_HEADER_BACKGROUND", "{{ background }}")
+
+-- Gum Pager Style Variables
+hl.env("GUM_PAGER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_PAGER_BACKGROUND", "{{ background }}")
+hl.env("GUM_PAGER_LINE_NUMBER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_PAGER_LINE_NUMBER_BACKGROUND", "{{ background }}")
+hl.env("GUM_PAGER_MATCH_FOREGROUND", "{{ accent }}")
+hl.env("GUM_PAGER_MATCH_BACKGROUND", "{{ background }}")
+hl.env("GUM_PAGER_MATCH_HIGH_FOREGROUND", "{{ accent }}")
+hl.env("GUM_PAGER_MATCH_HIGH_BACKGROUND", "{{ background }}")
+hl.env("GUM_PAGER_HELP_FOREGROUND", "{{ muted }}")
+hl.env("GUM_PAGER_HELP_BACKGROUND", "{{ background }}")
+
+-- Gum Write Style Variables
+hl.env("GUM_WRITE_BASE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_WRITE_BASE_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_CURSOR_LINE_NUMBER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_WRITE_CURSOR_LINE_NUMBER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_CURSOR_LINE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_WRITE_CURSOR_LINE_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_WRITE_CURSOR_FOREGROUND", "{{ bright_foreground }}")
+hl.env("GUM_WRITE_CURSOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_END_OF_BUFFER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_WRITE_END_OF_BUFFER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_LINE_NUMBER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_WRITE_LINE_NUMBER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_WRITE_HEADER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_PLACEHOLDER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_WRITE_PLACEHOLDER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_PROMPT_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_WRITE_PROMPT_BACKGROUND", "{{ background }}")
+
+-- Gum Log Style Variables
+hl.env("GUM_LOG_LEVEL_FOREGROUND", "{{ accent }}")
+hl.env("GUM_LOG_LEVEL_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_TIME_FOREGROUND", "{{ muted }}")
+hl.env("GUM_LOG_TIME_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_PREFIX_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_LOG_PREFIX_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_MESSAGE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_LOG_MESSAGE_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_KEY_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_LOG_KEY_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_VALUE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_LOG_VALUE_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_SEPARATOR_FOREGROUND", "{{ muted }}")
+hl.env("GUM_LOG_SEPARATOR_BACKGROUND", "{{ background }}")
diff --git a/default/themed/helix.toml.tpl b/default/themed/helix.toml.tpl
index 3cbe306..6ac03d0 100644
--- a/default/themed/helix.toml.tpl
+++ b/default/themed/helix.toml.tpl
@@ -76,12 +76,12 @@
 "ui.bufferline.active" = { fg = "foreground", bg = "background", underline = { color = "color5", style = "line" } }
 
 "ui.text" = "foreground"
-"ui.text.focus" = { fg = "foreground", bg = "color0", modifiers = ["bold"] }
+"ui.text.focus" = { fg = "foreground", bg = "lighter_background", modifiers = ["bold"] }
 "ui.text.inactive" = { fg = "color8" }
 "ui.text.directory" = { fg = "color4" }
 
 "ui.virtual" = "color8"
-"ui.virtual.ruler" = { bg = "color0" }
+"ui.virtual.ruler" = { bg = "lighter_background" }
 "ui.virtual.indent-guide" = "color8"
 "ui.virtual.inlay-hint" = { fg = "color8" }
 "ui.virtual.jump-label" = { fg = "color1", modifiers = ["bold"] }
@@ -96,9 +96,9 @@
 "ui.cursor.primary.insert" = { fg = "background", bg = "color2" }
 "ui.cursor.primary.select" = { fg = "background", bg = "color5" }
 
-"ui.cursorline.primary" = { bg = "color0" }
+"ui.cursorline.primary" = { bg = "lighter_background" }
 
-"ui.highlight" = { bg = "color0", modifiers = ["bold"] }
+"ui.highlight" = { bg = "lighter_background", modifiers = ["bold"] }
 
 "ui.menu" = { fg = "foreground", bg = "background" }
 "ui.menu.selected" = { fg = "background", bg = "foreground", modifiers = ["bold"] }
@@ -118,15 +118,16 @@ hint = "color6"
 [palette]
 background = "{{ background }}"
 foreground = "{{ foreground }}"
-cursor = "{{ cursor }}"
+lighter_background = "{{ lighter_background }}"
+cursor = "{{ bright_foreground }}"
 selection_background = "{{ selection_background }}"
 selection_foreground = "{{ selection_foreground }}"
-color0 = "{{ color0 }}"
-color1 = "{{ color1 }}"
-color2 = "{{ color2 }}"
-color3 = "{{ color3 }}"
-color4 = "{{ color4 }}"
-color5 = "{{ color5 }}"
-color6 = "{{ color6 }}"
-color7 = "{{ color7 }}"
-color8 = "{{ color8 }}"
+color0 = "{{ background }}"
+color1 = "{{ red }}"
+color2 = "{{ green }}"
+color3 = "{{ yellow }}"
+color4 = "{{ blue }}"
+color5 = "{{ magenta }}"
+color6 = "{{ cyan }}"
+color7 = "{{ foreground }}"
+color8 = "{{ muted }}"
diff --git a/default/themed/hermes.yaml.tpl b/default/themed/hermes.yaml.tpl
new file mode 100644
index 0000000..2e39710
--- /dev/null
+++ b/default/themed/hermes.yaml.tpl
@@ -0,0 +1,47 @@
+name: omarchy
+description: Omarchy system theme
+colors:
+  background: "{{ background }}"
+  ui_text: "{{ foreground }}"
+  ui_primary: "{{ accent }}"
+  ui_accent: "{{ accent }}"
+  ui_border: "{{ muted }}"
+  ui_label: "{{ accent }}"
+  ui_ok: "{{ green }}"
+  ui_warn: "{{ yellow }}"
+  ui_error: "{{ red }}"
+  ui_tool: "{{ cyan }}"
+  ui_thinking: "{{ dark_foreground }}"
+  banner_border: "{{ muted }}"
+  banner_title: "{{ accent }}"
+  banner_accent: "{{ accent }}"
+  banner_dim: "{{ dark_foreground }}"
+  banner_text: "{{ foreground }}"
+  prompt: "{{ bright_foreground }}"
+  input_rule: "{{ muted }}"
+  response_border: "{{ accent }}"
+  shell_dollar: "{{ blue }}"
+  selection_bg: "{{ selection }}"
+  session_label: "{{ accent }}"
+  session_border: "{{ muted }}"
+  status_bar_bg: "{{ dark_background }}"
+  status_bar_text: "{{ foreground }}"
+  status_bar_strong: "{{ accent }}"
+  status_bar_dim: "{{ dark_foreground }}"
+  status_bar_good: "{{ green }}"
+  status_bar_warn: "{{ yellow }}"
+  status_bar_bad: "{{ red }}"
+  status_bar_critical: "{{ bright_red }}"
+  voice_status_bg: "{{ dark_background }}"
+  completion_menu_bg: "{{ lighter_background }}"
+  completion_menu_current_bg: "{{ selection }}"
+  completion_menu_meta_bg: "{{ lighter_background }}"
+  completion_menu_meta_current_bg: "{{ selection }}"
+  diff_added: "{{ mix background green 15% }}"
+  diff_removed: "{{ mix background red 15% }}"
+  diff_added_word: "{{ green }}"
+  diff_removed_word: "{{ red }}"
+  syntax_string: "{{ green }}"
+  syntax_number: "{{ yellow }}"
+  syntax_keyword: "{{ magenta }}"
+  syntax_comment: "{{ muted }}"
diff --git a/default/themed/hyprland-preview-share-picker.css.tpl b/default/themed/hyprland-preview-share-picker.css.tpl
index 07e5e4e..750b726 100644
--- a/default/themed/hyprland-preview-share-picker.css.tpl
+++ b/default/themed/hyprland-preview-share-picker.css.tpl
@@ -1,10 +1,10 @@
 @define-color foreground {{ foreground }};
 @define-color background {{ background }};
 @define-color accent {{ accent }};
-@define-color muted {{ color8 }};
-@define-color card_bg {{ color0 }};
+@define-color muted {{ muted }};
+@define-color card_bg {{ lighter_background }};
 @define-color text_dark {{ background }};
-@define-color accent_hover {{ color12 }};
+@define-color accent_hover {{ bright_blue }};
 @define-color selected_tab {{ accent }};
 @define-color text {{ foreground }};
 
diff --git a/default/themed/hyprland.conf.tpl b/default/themed/hyprland.conf.tpl
deleted file mode 100644
index e4dbf3c..0000000
--- a/default/themed/hyprland.conf.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb({{ accent_strip }})
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/default/themed/hyprland.lua.tpl b/default/themed/hyprland.lua.tpl
index 27d2990..1a2d6d1 100644
--- a/default/themed/hyprland.lua.tpl
+++ b/default/themed/hyprland.lua.tpl
@@ -1,14 +1,18 @@
+local active_border_color = {{ hypr_gradient hyprland_active_border accent }}
+local inactive_border_color = {{ hypr_gradient hyprland_inactive_border rgba(595959aa) }}
+
 hl.config({
-    general = {
-        col = {
-            active_border = { colors = {"rgb({{ accent_strip }})", "rgb({{ color1_strip }})" }, angle = 45 },
-            inactive_border = { colors = {"rgb({{ color2_strip }})", "rgb({{ color2_strip }})" }, angle = 45 }
-        }
+  general = {
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
     },
-    group = {
-        col = {
-            border_active = { colors = {"rgb({{ accent_strip }})", "rgb({{ color1_strip }})" }, angle = 45 },
-            border_inactive = { colors = {"rgb({{ color2_strip }})", "rgb({{ color2_strip }})" }, angle = 45 }
-        }
-    }
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+  },
 })
diff --git a/default/themed/kitty.conf.tpl b/default/themed/kitty.conf.tpl
index e74a5bb..e94c127 100644
--- a/default/themed/kitty.conf.tpl
+++ b/default/themed/kitty.conf.tpl
@@ -3,25 +3,25 @@ background {{ background }}
 selection_foreground {{ selection_foreground }}
 selection_background {{ selection_background }}
 
-cursor {{ cursor }}
+cursor {{ bright_foreground }}
 cursor_text_color {{ background }}
 
 active_border_color {{ accent }}
 active_tab_background {{ accent }}
 
-color0 {{ color0 }}
-color1 {{ color1 }}
-color2 {{ color2 }}
-color3 {{ color3 }}
-color4 {{ color4 }}
-color5 {{ color5 }}
-color6 {{ color6 }}
-color7 {{ color7 }}
-color8 {{ color8 }}
-color9 {{ color9 }}
-color10 {{ color10 }}
-color11 {{ color11 }}
-color12 {{ color12 }}
-color13 {{ color13 }}
-color14 {{ color14 }}
-color15 {{ color15 }}
+color0 {{ background }}
+color1 {{ red }}
+color2 {{ green }}
+color3 {{ yellow }}
+color4 {{ blue }}
+color5 {{ magenta }}
+color6 {{ cyan }}
+color7 {{ foreground }}
+color8 {{ muted }}
+color9 {{ bright_red }}
+color10 {{ bright_green }}
+color11 {{ bright_yellow }}
+color12 {{ bright_blue }}
+color13 {{ bright_magenta }}
+color14 {{ bright_cyan }}
+color15 {{ bright_foreground }}
diff --git a/default/themed/neovim-vimpack.lua.tpl b/default/themed/neovim-vimpack.lua.tpl
new file mode 100644
index 0000000..aa232ac
--- /dev/null
+++ b/default/themed/neovim-vimpack.lua.tpl
@@ -0,0 +1,41 @@
+vim.pack.add({{ src = "https://github.com/bjarneo/aether.nvim", branch = "v3" }})
+
+require('aether').setup({
+        colors = {
+        bg = "{{ background }}",
+        dark_bg = "{{ dark_background }}",
+        darker_bg = "{{ darker_background }}",
+        lighter_bg = "{{ lighter_background }}",
+
+        fg = "{{ foreground }}",
+        dark_fg = "{{ dark_foreground }}",
+        light_fg = "{{ light_foreground }}",
+        bright_fg = "{{ bright_foreground }}",
+        muted = "{{ muted }}",
+
+        red = "{{ red }}",
+        yellow = "{{ yellow }}",
+        orange = "{{ orange }}",
+        green = "{{ green }}",
+        cyan = "{{ cyan }}",
+        blue = "{{ blue }}",
+        magenta = "{{ magenta }}",
+        brown = "{{ brown }}",
+
+        bright_red = "{{ bright_red }}",
+        bright_yellow = "{{ bright_yellow }}",
+        bright_green = "{{ bright_green }}",
+        bright_cyan = "{{ bright_cyan }}",
+        bright_blue = "{{ bright_blue }}",
+        bright_magenta = "{{ bright_magenta }}",
+
+        accent = "{{ accent }}",
+        cursor = "{{ bright_foreground }}",
+        foreground = "{{ foreground }}",
+        background = "{{ background }}",
+        selection = "{{ selection }}",
+        selection_foreground = "{{ selection_foreground }}",
+        selection_background = "{{ selection_background }}",
+        },
+})
+vim.cmd('colorscheme aether')
diff --git a/default/themed/neovim.lua.tpl b/default/themed/neovim.lua.tpl
new file mode 100644
index 0000000..ad4353f
--- /dev/null
+++ b/default/themed/neovim.lua.tpl
@@ -0,0 +1,52 @@
+return {
+  {
+    "bjarneo/aether.nvim",
+    branch = "v3",
+    name = "aether",
+    priority = 1000,
+    opts = {
+      colors = {
+        bg = "{{ background }}",
+        dark_bg = "{{ dark_background }}",
+        darker_bg = "{{ darker_background }}",
+        lighter_bg = "{{ lighter_background }}",
+
+        fg = "{{ foreground }}",
+        dark_fg = "{{ dark_foreground }}",
+        light_fg = "{{ light_foreground }}",
+        bright_fg = "{{ bright_foreground }}",
+        muted = "{{ muted }}",
+
+        red = "{{ red }}",
+        yellow = "{{ yellow }}",
+        orange = "{{ orange }}",
+        green = "{{ green }}",
+        cyan = "{{ cyan }}",
+        blue = "{{ blue }}",
+        magenta = "{{ magenta }}",
+        brown = "{{ brown }}",
+
+        bright_red = "{{ bright_red }}",
+        bright_yellow = "{{ bright_yellow }}",
+        bright_green = "{{ bright_green }}",
+        bright_cyan = "{{ bright_cyan }}",
+        bright_blue = "{{ bright_blue }}",
+        bright_magenta = "{{ bright_magenta }}",
+
+        accent = "{{ accent }}",
+        cursor = "{{ bright_foreground }}",
+        foreground = "{{ foreground }}",
+        background = "{{ background }}",
+        selection = "{{ selection }}",
+        selection_foreground = "{{ selection_foreground }}",
+        selection_background = "{{ selection_background }}",
+      },
+    },
+  },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "aether",
+    },
+  },
+}
diff --git a/default/themed/obsidian.css.tpl b/default/themed/obsidian.css.tpl
index e255b0e..e3702d4 100644
--- a/default/themed/obsidian.css.tpl
+++ b/default/themed/obsidian.css.tpl
@@ -12,18 +12,18 @@
   --text-selection: {{ selection_background }};
 
   /* Border color */
-  --background-modifier-border: {{ color8 }};
+  --background-modifier-border: {{ muted }};
 
   /* Semantic heading colors */
-  --text-title-h1: {{ color1 }};
-  --text-title-h2: {{ color2 }};
-  --text-title-h3: {{ color3 }};
-  --text-title-h4: {{ color4 }};
-  --text-title-h5: {{ color5 }};
-  --text-title-h6: {{ color5 }};
+  --text-title-h1: {{ red }};
+  --text-title-h2: {{ green }};
+  --text-title-h3: {{ yellow }};
+  --text-title-h4: {{ blue }};
+  --text-title-h5: {{ magenta }};
+  --text-title-h6: {{ magenta }};
 
   /* Links and accents */
-  --text-link: {{ color4 }};
+  --text-link: {{ blue }};
   --text-accent: {{ accent }};
   --text-accent-hover: {{ accent }};
   --interactive-accent: {{ accent }};
@@ -34,23 +34,23 @@
   --text-faint: color-mix(in srgb, {{ foreground }} 55%, transparent);
 
   /* Code */
-  --code-normal: {{ color6 }};
+  --code-normal: {{ cyan }};
 
   /* Errors and success */
-  --text-error: {{ color1 }};
-  --text-error-hover: {{ color1 }};
-  --text-success: {{ color2 }};
+  --text-error: {{ red }};
+  --text-error-hover: {{ red }};
+  --text-success: {{ green }};
 
   /* Tags */
-  --tag-color: {{ color6 }};
-  --tag-background: {{ color8 }};
+  --tag-color: {{ cyan }};
+  --tag-background: {{ muted }};
 
   /* Graph */
-  --graph-line: {{ color8 }};
+  --graph-line: {{ muted }};
   --graph-node: {{ accent }};
-  --graph-node-focused: {{ color4 }};
-  --graph-node-tag: {{ color6 }};
-  --graph-node-attachment: {{ color2 }};
+  --graph-node-focused: {{ blue }};
+  --graph-node-tag: {{ cyan }};
+  --graph-node-attachment: {{ green }};
 }
 
 /* Headers */
@@ -63,16 +63,16 @@
 
 /* Code blocks */
 .markdown-rendered code {
-  color: {{ color6 }};
+  color: {{ cyan }};
 }
 
 /* Syntax highlighting */
-.cm-s-obsidian span.cm-keyword { color: {{ color1 }}; }
-.cm-s-obsidian span.cm-string { color: {{ color2 }}; }
-.cm-s-obsidian span.cm-number { color: {{ color3 }}; }
-.cm-s-obsidian span.cm-comment { color: {{ color8 }}; }
-.cm-s-obsidian span.cm-operator { color: {{ color4 }}; }
-.cm-s-obsidian span.cm-def { color: {{ color4 }}; }
+.cm-s-obsidian span.cm-keyword { color: {{ red }}; }
+.cm-s-obsidian span.cm-string { color: {{ green }}; }
+.cm-s-obsidian span.cm-number { color: {{ yellow }}; }
+.cm-s-obsidian span.cm-comment { color: {{ muted }}; }
+.cm-s-obsidian span.cm-operator { color: {{ blue }}; }
+.cm-s-obsidian span.cm-def { color: {{ blue }}; }
 
 /* Links */
 .markdown-rendered a {
diff --git a/default/themed/pi.json.tpl b/default/themed/pi.json.tpl
new file mode 100644
index 0000000..b93faa1
--- /dev/null
+++ b/default/themed/pi.json.tpl
@@ -0,0 +1,95 @@
+{
+  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "name": "omarchy-system",
+  "vars": {
+    "background": "{{ background }}",
+    "foreground": "{{ foreground }}",
+    "accent": "{{ accent }}",
+    "selectionBackground": "{{ selection_background }}",
+    "selectionForeground": "{{ selection_foreground }}",
+    "selectedBackground": "{{ mix background accent 22% }}",
+    "color0": "{{ background }}",
+    "color1": "{{ red }}",
+    "color2": "{{ green }}",
+    "color3": "{{ yellow }}",
+    "color4": "{{ blue }}",
+    "color5": "{{ magenta }}",
+    "color6": "{{ cyan }}",
+    "color7": "{{ foreground }}",
+    "color8": "{{ muted }}",
+    "color9": "{{ bright_red }}",
+    "color10": "{{ bright_green }}",
+    "color11": "{{ bright_yellow }}",
+    "color12": "{{ bright_blue }}",
+    "color13": "{{ bright_magenta }}",
+    "color14": "{{ bright_cyan }}",
+    "color15": "{{ bright_foreground }}",
+    "panel": "{{ mix background foreground 6% }}",
+    "panelAlt": "{{ mix background foreground 10% }}",
+    "panelPending": "{{ mix background accent 12% }}",
+    "panelSuccess": "{{ mix background green 12% }}",
+    "panelError": "{{ mix background red 12% }}",
+    "border": "{{ mix background foreground 30% }}",
+    "borderMuted": "{{ mix background foreground 20% }}",
+    "mutedText": "{{ mix foreground background 34% }}",
+    "dimText": "{{ mix foreground background 52% }}"
+  },
+  "colors": {
+    "accent": "accent",
+    "border": "border",
+    "borderAccent": "accent",
+    "borderMuted": "borderMuted",
+    "success": "color2",
+    "error": "color1",
+    "warning": "color3",
+    "muted": "mutedText",
+    "dim": "dimText",
+    "text": "foreground",
+    "thinkingText": "dimText",
+    "selectedBg": "selectedBackground",
+    "userMessageBg": "panel",
+    "userMessageText": "foreground",
+    "customMessageBg": "panel",
+    "customMessageText": "foreground",
+    "customMessageLabel": "accent",
+    "toolPendingBg": "panelPending",
+    "toolSuccessBg": "panelSuccess",
+    "toolErrorBg": "panelError",
+    "toolTitle": "accent",
+    "toolOutput": "foreground",
+    "mdHeading": "color5",
+    "mdLink": "accent",
+    "mdLinkUrl": "color6",
+    "mdCode": "color6",
+    "mdCodeBlock": "foreground",
+    "mdCodeBlockBorder": "borderMuted",
+    "mdQuote": "mutedText",
+    "mdQuoteBorder": "borderMuted",
+    "mdHr": "borderMuted",
+    "mdListBullet": "color5",
+    "toolDiffAdded": "color2",
+    "toolDiffRemoved": "color1",
+    "toolDiffContext": "mutedText",
+    "syntaxComment": "dimText",
+    "syntaxKeyword": "color5",
+    "syntaxFunction": "color4",
+    "syntaxVariable": "accent",
+    "syntaxString": "color2",
+    "syntaxNumber": "color3",
+    "syntaxType": "color4",
+    "syntaxOperator": "color5",
+    "syntaxPunctuation": "mutedText",
+    "thinkingOff": "borderMuted",
+    "thinkingMinimal": "accent",
+    "thinkingLow": "color4",
+    "thinkingMedium": "color5",
+    "thinkingHigh": "color3",
+    "thinkingXhigh": "color1",
+    "bashMode": "color3"
+  },
+  "export": {
+    "pageBg": "{{ background }}",
+    "cardBg": "{{ mix background foreground 6% }}",
+    "infoBg": "{{ mix background foreground 10% }}"
+  }
+}
diff --git a/default/themed/rio.toml.tpl b/default/themed/rio.toml.tpl
index 924e8db..f0ec805 100644
--- a/default/themed/rio.toml.tpl
+++ b/default/themed/rio.toml.tpl
@@ -1,56 +1,56 @@
 [colors]
 # Regular colors
 background = '{{ background }}'
-black = '{{ color0 }}'
-blue = '{{ color4 }}'
-cyan = '{{ color6 }}'
+black = '{{ background }}'
+blue = '{{ blue }}'
+cyan = '{{ cyan }}'
 foreground  = '{{ foreground }}'
-green = '{{ color2 }}'
-magenta = '{{ color5 }}'
-red = '{{ color1 }}'
-white = '{{ color15 }}'
-yellow = '{{ color11 }}'
+green = '{{ green }}'
+magenta = '{{ magenta }}'
+red = '{{ red }}'
+white = '{{ foreground }}'
+yellow = '{{ yellow }}'
 
 # Cursor
-cursor = '{{ cursor }}'
+cursor = '{{ bright_foreground }}'
 vi-cursor = '{{ accent }}'
 
 # Navigation
 # tabs and tabs-active set the inactive/active tab title colors.
 # Tab island backgrounds are derived from the window background color.
-tabs = '{{ color8 }}'
-tabs-active = '{{ color15 }}'
-split = '{{ color8 }}'
-split-active = '{{ color15 }}'
+tabs = '{{ muted }}'
+tabs-active = '{{ selection }}'
+split = '{{ muted }}'
+split-active = '{{ selection }}'
 
 # Search
-search-match-background = '{{ color12 }}'
-search-match-foreground = '{{ color15 }}'
-search-focused-match-background = '{{ color3 }}'
-search-focused-match-foreground = '{{ color15 }}'
+search-match-background = '{{ light_background }}'
+search-match-foreground = '{{ dark_foreground }}'
+search-focused-match-background = '{{ lighter_background }}'
+search-focused-match-foreground = '{{ dark_foreground }}'
 
 # Selection
 selection-foreground = '{{ selection_foreground }}'
 selection-background = '{{ selection_background }}'
 
 # Dim colors
-dim-black = '{{ color0 }}'
-dim-blue = '{{ color4 }}'
-dim-cyan = '{{ color6 }}'
+dim-black = '{{ background }}'
+dim-blue = '{{ blue }}'
+dim-cyan = '{{ cyan }}'
 dim-foreground = '{{ foreground }}'
-dim-green = '{{ color2 }}'
-dim-magenta = '{{ color5 }}'
-dim-red = '{{ color1 }}'
-dim-white = '{{ color15 }}'
-dim-yellow = '{{ color11 }}'
+dim-green = '{{ green }}'
+dim-magenta = '{{ magenta }}'
+dim-red = '{{ red }}'
+dim-white = '{{ foreground }}'
+dim-yellow = '{{ yellow }}'
 
 # Light colors
-light-black = '{{ color8 }}'
-light-blue = '{{ color12 }}'
-light-cyan = '{{ color14 }}'
-light-foreground = '{{ foreground }}'
-light-green = '{{ color10 }}'
-light-magenta = '{{ color13 }}'
-light-red = '{{ color9 }}'
-light-white = '{{ color15 }}'
-light-yellow = '{{ color11 }}'
+light-black = '{{ lighter_background }}'
+light-blue = '{{ bright_blue }}'
+light-cyan = '{{ bridht_cyan }}'
+light-foreground = '{{ bright_foreground }}'
+light-green = '{{ bright_green }}'
+light-magenta = '{{ bright_magenta }}'
+light-red = '{{ bright_red}}'
+light-white = '{{ bright_foreground }}'
+light-yellow = '{{ bright_yellow }}'
diff --git a/default/themed/rofi.rasi.tpl b/default/themed/rofi.rasi.tpl
index b7d8d1b..c537f98 100644
--- a/default/themed/rofi.rasi.tpl
+++ b/default/themed/rofi.rasi.tpl
@@ -1,20 +1,20 @@
 * {
     background: {{ background }};
     foreground: {{ foreground }};
-    active-background: {{ color2 }};
-    urgent-background: {{ color1 }};
+    active-background: {{ lighter_background }};
+    urgent-background: {{ accent }};
 
-    normal-foreground: {{ color3 }};
-    normal-background: {{ background }};
+    normal-foreground: {{ dark_foreground }};
+    normal-background: {{ dark_background }};
 
     selected-foreground: {{ selection_foreground }};
     selected-background: {{ selection_background }};
 
     seperator-color: {{ background }};
-    border-color: {{ color0 }};
+    border-color: {{ accent }};
 
-    prompt-color: {{ color4 }};
-    prompt-background-color: {{ color0 }};
+    prompt-color: {{ light_foreground }};
+    prompt-background-color: {{ darker_background }};
 
     window-border-size: 1px;
     window-border-radius: 8px;
diff --git a/default/themed/shell.toml.tpl b/default/themed/shell.toml.tpl
new file mode 100644
index 0000000..b0a68d8
--- /dev/null
+++ b/default/themed/shell.toml.tpl
@@ -0,0 +1,237 @@
+# Omarchy shell surfaces. Colors derive from colors.toml; sizes and the
+# typographic scale come from the keys below. Themes can ship
+# themes/<name>/shell.toml to replace this generated file.
+
+[bar]
+# Alpha companions (where present) range from 0 (invisible) to 1 (opaque).
+background       = "{{ background }}"
+background-alpha = 1.0
+text             = "{{ foreground }}"
+# Modules calling attention to themselves (recording, voxtype, alerts, updates)
+active           = "{{ red }}"
+# Cross-axis size at font base-size 12. size-horizontal is the height of
+# top/bottom bars; size-vertical is the width of left/right bars. With
+# scale-with-font enabled, these grow/shrink with [font] base-size.
+scale-with-font  = true
+size-horizontal  = 26
+size-vertical    = 28
+
+[hyprland]
+# Shared Hyprland-derived border tokens. Surface sections reference these so
+# lock, notifications, popups, and menu-style cards stay aligned with the
+# current Hyprland active-border gradient.
+active-border            = "{{ shell_gradient hyprland_active_border accent }}"
+active-border-foreground = "{{ shell_gradient hyprland_active_border foreground }}"
+
+[controls]
+# Shared state tokens for interactive control chrome (buttons, dropdowns,
+# tab strips, etc).
+
+# Normal: idle control chrome. Border widths accept one CSS-style scalar/list:
+# N, "Y X", "T X B", or "T R B L". Per-side keys like
+# normal-border-width-left override the list. Each *-border accepts either a
+# solid color or a Hyprland-style gradient, e.g. "rgba(...) rgba(...) 45deg".
+normal-color        = "{{ foreground }}"
+normal-fill-alpha   = 0.04
+normal-border       = "{{ foreground }}"
+normal-border-width = 1
+normal-border-alpha = 0.4
+
+# Hover-cursor: mouse hover and the panel keyboard cursor.
+hover-cursor-color        = "{{ foreground }}"
+hover-cursor-fill-alpha   = 0.08
+hover-cursor-border       = "{{ foreground }}"
+hover-cursor-border-width = 1
+hover-cursor-border-alpha = 0.25
+
+# Focus: Qt activeFocus. Mirror the hover-cursor values by default so
+# mouse hover, keyboard cursor, and tab focus all read as the same state
+# — themes that want focus to stand out override these four lines.
+focus-color        = "{{ foreground }}"
+focus-fill-alpha   = 0.08
+focus-border       = "{{ foreground }}"
+focus-border-width = 1
+focus-border-alpha = 0.25
+
+# Selected: persistent chosen/current state.
+selected-color        = "{{ foreground }}"
+selected-fill-alpha   = 0.18
+selected-border       = "{{ foreground }}"
+selected-border-width = 0
+selected-border-alpha = 1.0
+
+# Momentary fills.
+pressed-fill-alpha   = 0.22
+selection-fill-alpha = 0.35
+
+[spacing]
+# `scale` multiplies shared margins, gaps, padding, controls, and panel
+# dimensions; components keep their proportions. With scale-with-font
+# enabled, those dimensions grow/shrink with [font] base-size too. Per-token
+# overrides (in px) below pin individual values without affecting the rest
+# of the scale. Uncomment any to tune a specific surface.
+scale = 1.0
+scale-with-font = true
+# xxs                       = 2
+# xs                        = 3
+# sm                        = 4
+# md                        = 6
+# lg                        = 8
+# xl                        = 10
+# xxl                       = 12
+# xxxl                      = 14
+# huge                      = 18
+# control-gap               = 8
+# control-padding-x         = 10
+# control-padding-y         = 6
+# input-padding-y           = 7
+# control-height            = 28
+# popup-row-height          = 28
+# row-gap                   = 8
+# row-padding-x             = 12
+# label-gap                 = 4
+# panel-gap                 = 14
+# panel-padding             = 18
+# popup-padding             = 14
+# dropdown-width            = 240
+# searchable-dropdown-width = 260
+# number-field-width        = 120
+# searchable-popup-min-height = 220
+
+[font]
+# base-size is the rem root for the type scale. Every Style.font.<token>
+# derives from it (e.g. body = base, subtitle ≈ base * 1.083,
+# heading ≈ base * 1.333). The shell only floors this at 1px; increase it
+# as much as you want.
+base-size = 12
+# Per-token overrides, in px. Uncomment any to pin a specific size without
+# affecting the rest of the scale. Useful for stylistic emphasis (a
+# minimalist theme that wants a bigger heading without scaling everything).
+# caption       = 10
+# body-small    = 11
+# body          = 12
+# subtitle      = 13
+# title         = 14
+# heading       = 16
+# display       = 24
+# display-large = 28
+# icon-small    = 11
+# icon          = 14
+# icon-large    = 18
+
+[popups]
+# Shared by every bar flyout (dropdowns, OSD, popup cards).
+# Border accepts either a solid color or a Hyprland-style gradient. Border
+# widths accept one CSS-style scalar/list: N, "Y X", "T X B", or "T R B L";
+# individual border-width-top/right/bottom/left keys override the list.
+background       = "{{ background }}"
+background-alpha = 1.0
+text             = "{{ foreground }}"
+border           = "hyprland.active-border"
+border-alpha     = 1.0
+# border-width     = 2
+
+[tooltip]
+# Hover tooltips across the bar, panels, and buttons. background-alpha of
+# 0.97 mirrors the legacy hard-coded tooltip opacity.
+background       = "{{ background }}"
+background-alpha = 0.97
+text             = "{{ foreground }}"
+border           = "hyprland.active-border-foreground"
+border-alpha     = 1.0
+
+[notifications]
+background       = "{{ background }}"
+background-alpha = 1.0
+text             = "{{ foreground }}"
+# Conventionally matches the Hyprland active-window border. Border accepts
+# either a solid color or the full active-border gradient.
+border           = "hyprland.active-border"
+border-alpha     = 1.0
+# border-width     = 2
+countdown        = "{{ accent }}"
+
+[launcher]
+# Same six tokens as [menu], applied to the launcher overlay. Alpha
+# companions go from 0 (invisible) to 1 (opaque). scrim is the full-screen
+# dim layer behind the card; background is the card itself. Defaults
+# mirror [menu] with the card at 0.95 to preserve the legacy translucency.
+background                = "{{ background }}"
+background-alpha          = 0.95
+text                      = "{{ foreground }}"
+border                    = "hyprland.active-border-foreground"
+border-alpha              = 1.0
+scrim                     = "{{ background }}"
+scrim-alpha               = 0.5
+selected-background       = "{{ foreground }}"
+selected-background-alpha = 0.08
+selected-text             = "{{ accent }}"
+selected-border           = "hyprland.active-border-foreground"
+selected-border-alpha     = 0.25
+
+[menu]
+# Cards, rows, and selected-row treatment. Alpha companions (where present)
+# go from 0 (invisible) to 1 (opaque). scrim is the full-screen dim layer
+# behind the card. Clipboard and emojis inherit these tokens.
+background                = "{{ background }}"
+background-alpha          = 1.0
+text                      = "{{ foreground }}"
+border                    = "hyprland.active-border-foreground"
+border-alpha              = 1.0
+scrim                     = "{{ background }}"
+scrim-alpha               = 0.5
+selected-background       = "{{ foreground }}"
+selected-background-alpha = 0.08
+selected-text             = "{{ accent }}"
+selected-border           = "hyprland.active-border-foreground"
+selected-border-alpha     = 0.25
+
+[polkit]
+# Polkit authentication prompt (sudo/password dialogs). scrim is the
+# darkening layer behind the card; background is the card itself.
+# text-error tints the lock icon, password text, and placeholder when
+# authentication fails. border-alpha applies to both border and
+# border-error (the two states are mutually exclusive in time).
+background       = "{{ background }}"
+background-alpha = 1.0
+text             = "{{ foreground }}"
+text-error       = "{{ red }}"
+border           = "hyprland.active-border"
+border-error     = "{{ red }}"
+border-alpha     = 1.0
+scrim            = "{{ background }}"
+scrim-alpha      = 0.5
+# accent is the lock-icon glyph color + text-selection tint.
+accent           = "{{ accent }}"
+
+[lock]
+# Lock screen password input. background/background-alpha control the
+# centered input field card; border/border-active/border-error cycle
+# through idle, typing/authenticating, and wrong-password states.
+# border-alpha applies to all three border states (they are mutually
+# exclusive in time).
+background       = "{{ background }}"
+background-alpha = 0.8
+text             = "{{ foreground }}"
+placeholder      = "{{ mix foreground background 34% }}"
+text-error       = "{{ red }}"
+border           = "hyprland.active-border"
+border-active    = "hyprland.active-border"
+border-error     = "{{ red }}"
+border-alpha     = 1.0
+# selection is the text-selection tint inside the input field.
+selection        = "{{ accent }}"
+selection-alpha  = 0.45
+
+[image-picker]
+# Carousel-style picker. The picker has no card surface, so `scrim` is
+# the full-screen wash. Per-slice dim overlays and text outlines on top
+# of the scrim track the foundational background color directly.
+# unselected-border-alpha softens carousel slices that aren't selected.
+scrim                   = "{{ background }}"
+scrim-alpha             = 0.5
+text                    = "{{ foreground }}"
+selected-border         = "{{ accent }}"
+selected-border-alpha   = 1.0
+unselected-border       = "{{ foreground }}"
+unselected-border-alpha = 0.28
diff --git a/default/themed/strata.toml.tpl b/default/themed/strata.toml.tpl
index d528a58..107294e 100644
--- a/default/themed/strata.toml.tpl
+++ b/default/themed/strata.toml.tpl
@@ -1,10 +1,10 @@
 name = "omarchy"
 background = "{{ background }}"
-surface = "{{ color0 }}"
+surface = "{{ darker_background }}"
 text = "{{ foreground }}"
-accent = "{{ color7 }}"
-danger = "{{ color1 }}"
-muted = "{{ color8 }}"
-highlight = "{{ color4 }}"
-border = "{{ color2 }}"
-dim_text = "{{ color3 }}"
+accent = "{{ accent }}"
+danger = "{{ red }}"
+muted = "{{ muted }}"
+highlight = "{{ selection }}"
+border = "{{ light_foreground }}"
+dim_text = "{{ dark_foreground }}"
diff --git a/default/themed/t3code.json.tpl b/default/themed/t3code.json.tpl
new file mode 100644
index 0000000..e420dcc
--- /dev/null
+++ b/default/themed/t3code.json.tpl
@@ -0,0 +1,36 @@
+{
+  "name": "Omarchy",
+  "appearance": "{{ mode }}",
+  "canvas": "{{ background }}",
+  "accent": "{{ accent }}",
+  "colors": {
+    "chrome": "{{ background }}",
+    "toolbar": "{{ background }}",
+    "toolbarForeground": "{{ foreground }}",
+    "toolbarBorder": "{{ muted }}",
+
+    "text": "{{ foreground }}",
+    "border": "{{ muted }}",
+    "focus": "{{ accent }}",
+
+    "sidebar": "{{ dark_background }}",
+    "sidebarForeground": "{{ foreground }}",
+    "sidebarBorder": "{{ muted }}",
+    "sidebarRowHover": "{{ mix dark_background foreground 6% }}",
+    "sidebarRowActive": "{{ mix dark_background accent 18% }}",
+    "sidebarRowSelected": "{{ selection }}",
+
+    "error": "{{ mix red foreground 35% }}",
+    "warning": "{{ mix yellow foreground 35% }}",
+
+    "codeBackground": "{{ dark_background }}",
+    "codeForeground": "{{ foreground }}",
+
+    "terminalBackground": "{{ background }}",
+    "terminalForeground": "{{ foreground }}",
+    "terminalCursor": "{{ bright_foreground }}",
+    "terminalSelection": "{{ selection }}",
+    "terminalScrollbar": "{{ muted }}",
+    "terminalScrollbarHover": "{{ dark_foreground }}"
+  }
+}
diff --git a/default/themed/tmux.tpl b/default/themed/tmux.tpl
index 6a27692..0faa762 100644
--- a/default/themed/tmux.tpl
+++ b/default/themed/tmux.tpl
@@ -1,25 +1,25 @@
 color_bg0="{{ background }}"
-color_bg1="{{ color0 }}"
-color_bg2="{{ color7 }}"
+color_bg1="{{ dark_background }}"
+color_bg2="{{ darker_background }}"
 color_fg0="{{ foreground }}"
-color_fg1="{{ color3 }}"
+color_fg1="{{ light_foreground }}"
 
-color_status_fg="{{ color4 }}"
-color_status_bg="{{ color0 }}"
+color_status_fg="{{ light_foreground }}"
+color_status_bg="{{ muted }}"
 
 color_selected_fg="{{ selection_foreground }}"
 color_selected_bg="{{ selection_background }}"
 
-color_highlight_fg="{{ color2 }}"
+color_highlight_fg="{{ yellow }}"
 color_highlight_bg="{{ background }}"
 
-color_current_fg="{{ color1 }}"
+color_current_fg="{{ orange }}"
 color_current_bg="{{ background }}"
 
-color_check_fg="{{ color5 }}"
+color_check_fg="{{ green }}"
 
 pane_border_fg="{{ foreground }}"
-pane_border_selected_fg="{{ color2 }}"
+pane_border_selected_fg="{{ bright_foreground }}"
 
 set -g @prefix_highlight_fg "${color_highlight_fg}"
 set -g @prefix_highlight_bg "${color_highlight_bg}"
diff --git a/default/themed/vscode-theme.json.tpl b/default/themed/vscode-theme.json.tpl
new file mode 100644
index 0000000..0897ca0
--- /dev/null
+++ b/default/themed/vscode-theme.json.tpl
@@ -0,0 +1,1340 @@
+{
+    "name": "Omarchy",
+    "$schema": "vscode://schemas/color-theme",
+    "type": "{{ theme_type }}",
+    "semanticHighlighting": true,
+    "semanticTokenColors": {
+        "parameter": "{{ cyan }}",
+        "parameter.declaration": "{{ cyan }}",
+        "variable": "{{ foreground }}",
+        "variable.declaration": "{{ foreground }}",
+        "variable.readonly": "{{ bright_yellow }}",
+        "variable.defaultLibrary": "{{ foreground }}",
+        "property": "{{ cyan }}",
+        "property.declaration": "{{ cyan }}",
+        "property.readonly": "{{ cyan }}",
+        "function": "{{ blue }}",
+        "function.declaration": "{{ blue }}",
+        "function.defaultLibrary": "{{ cyan }}",
+        "method": "{{ blue }}",
+        "method.declaration": "{{ blue }}",
+        "class": "{{ yellow }}",
+        "class.declaration": "{{ yellow }}",
+        "class.defaultLibrary": "{{ yellow }}",
+        "interface": "{{ yellow }}",
+        "interface.declaration": "{{ yellow }}",
+        "enum": "{{ yellow }}",
+        "enumMember": "{{ orange }}",
+        "type": "{{ yellow }}",
+        "type.declaration": "{{ yellow }}",
+        "type.defaultLibrary": "{{ foreground }}",
+        "typeParameter": "{{ yellow }}",
+        "namespace": "{{ blue }}",
+        "macro": "{{ cyan }}",
+        "decorator": "{{ blue }}",
+        "string": "{{ green }}",
+        "number": "{{ orange }}",
+        "boolean": "{{ orange }}",
+        "regexp": "{{ bright_cyan }}",
+        "operator": "{{ bright_blue }}",
+        "keyword": "{{ bright_magenta }}",
+        "comment": {"foreground": "{{ muted }}", "fontStyle": "italic"},
+        "comment.documentation": {"foreground": "{{ muted }}", "fontStyle": "italic"}
+    },
+    "colors": {
+        "foreground": "{{ foreground }}",
+        "disabledForeground": "{{ dark_foreground }}",
+        "focusBorder": "{{ accent }}80",
+        "widget.shadow": "{{ background }}80",
+        "selection.background": "{{ selection_background }}80",
+        "descriptionForeground": "{{ muted }}",
+        "errorForeground": "{{ red }}",
+        "icon.foreground": "{{ foreground }}",
+        "sash.hoverBorder": "{{ accent }}",
+
+        "textBlockQuote.background": "{{ background }}",
+        "textBlockQuote.border": "{{ accent }}",
+        "textCodeBlock.background": "{{ background }}",
+        "textLink.activeForeground": "{{ bright_blue }}",
+        "textLink.foreground": "{{ blue }}",
+        "textPreformat.foreground": "{{ cyan }}",
+        "textPreformat.background": "{{ background }}",
+        "textSeparator.foreground": "{{ muted }}",
+
+        "toolbar.hoverBackground": "{{ background }}",
+        "toolbar.activeBackground": "{{ muted }}",
+
+        "button.background": "{{ accent }}",
+        "button.foreground": "{{ background }}",
+        "button.hoverBackground": "{{ blue }}",
+        "button.secondaryForeground": "{{ foreground }}",
+        "button.secondaryBackground": "{{ muted }}",
+        "button.secondaryHoverBackground": "{{ background }}",
+        "button.border": "{{ accent }}20",
+        "checkbox.background": "{{ background }}",
+        "checkbox.foreground": "{{ foreground }}",
+        "checkbox.border": "{{ muted }}",
+        "checkbox.selectBackground": "{{ accent }}",
+        "checkbox.selectBorder": "{{ accent }}",
+
+        "dropdown.background": "{{ background }}",
+        "dropdown.listBackground": "{{ background }}",
+        "dropdown.border": "{{ muted }}",
+        "dropdown.foreground": "{{ foreground }}",
+
+        "input.background": "{{ background }}",
+        "input.border": "{{ muted }}",
+        "input.foreground": "{{ foreground }}",
+        "input.placeholderForeground": "{{ muted }}",
+        "inputOption.activeBackground": "{{ accent }}40",
+        "inputOption.activeBorder": "{{ accent }}",
+        "inputOption.activeForeground": "{{ foreground }}",
+        "inputOption.hoverBackground": "{{ muted }}",
+        "inputValidation.errorBackground": "{{ red }}20",
+        "inputValidation.errorForeground": "{{ red }}",
+        "inputValidation.errorBorder": "{{ red }}",
+        "inputValidation.infoBackground": "{{ blue }}20",
+        "inputValidation.infoForeground": "{{ blue }}",
+        "inputValidation.infoBorder": "{{ blue }}",
+        "inputValidation.warningBackground": "{{ yellow }}20",
+        "inputValidation.warningForeground": "{{ yellow }}",
+        "inputValidation.warningBorder": "{{ yellow }}",
+
+        "scrollbar.shadow": "{{ background }}",
+        "scrollbarSlider.activeBackground": "{{ accent }}80",
+        "scrollbarSlider.background": "{{ muted }}40",
+        "scrollbarSlider.hoverBackground": "{{ muted }}80",
+
+        "badge.background": "{{ accent }}",
+        "badge.foreground": "{{ background }}",
+
+        "progressBar.background": "{{ accent }}",
+
+        "list.activeSelectionBackground": "{{ accent }}30",
+        "list.activeSelectionForeground": "{{ foreground }}",
+        "list.activeSelectionIconForeground": "{{ foreground }}",
+        "list.dropBackground": "{{ accent }}20",
+        "list.focusBackground": "{{ accent }}20",
+        "list.focusForeground": "{{ foreground }}",
+        "list.focusOutline": "{{ accent }}60",
+        "list.highlightForeground": "{{ accent }}",
+        "list.hoverBackground": "{{ background }}",
+        "list.hoverForeground": "{{ foreground }}",
+        "list.inactiveSelectionBackground": "{{ muted }}40",
+        "list.inactiveSelectionForeground": "{{ foreground }}",
+        "list.inactiveFocusBackground": "{{ muted }}40",
+        "list.inactiveFocusOutline": "{{ muted }}",
+        "list.invalidItemForeground": "{{ red }}",
+        "list.errorForeground": "{{ red }}",
+        "list.warningForeground": "{{ yellow }}",
+        "listFilterWidget.background": "{{ background }}",
+        "listFilterWidget.outline": "{{ accent }}",
+        "listFilterWidget.noMatchesOutline": "{{ red }}",
+        "list.filterMatchBackground": "{{ accent }}30",
+        "list.filterMatchBorder": "{{ accent }}",
+        "tree.indentGuidesStroke": "{{ muted }}",
+        "tree.inactiveIndentGuidesStroke": "{{ muted }}60",
+        "tree.tableColumnsBorder": "{{ muted }}",
+        "tree.tableOddRowsBackground": "{{ background }}40",
+
+        "activityBar.background": "{{ background }}",
+        "activityBar.dropBorder": "{{ accent }}",
+        "activityBar.foreground": "{{ foreground }}",
+        "activityBar.inactiveForeground": "{{ muted }}",
+        "activityBar.border": "{{ background }}",
+        "activityBarBadge.background": "{{ accent }}",
+        "activityBarBadge.foreground": "{{ background }}",
+        "activityBar.activeBorder": "{{ accent }}",
+        "activityBar.activeBackground": "{{ background }}40",
+
+        "sideBar.background": "{{ background }}",
+        "sideBar.foreground": "{{ foreground }}",
+        "sideBar.border": "{{ background }}",
+        "sideBar.dropBackground": "{{ accent }}20",
+        "sideBarTitle.foreground": "{{ foreground }}",
+        "sideBarSectionHeader.background": "{{ background }}",
+        "sideBarSectionHeader.foreground": "{{ foreground }}",
+        "sideBarSectionHeader.border": "{{ muted }}40",
+
+        "minimap.findMatchHighlight": "{{ accent }}80",
+        "minimap.selectionHighlight": "{{ accent }}60",
+        "minimap.errorHighlight": "{{ red }}",
+        "minimap.warningHighlight": "{{ yellow }}",
+        "minimap.background": "{{ background }}",
+        "minimap.selectionOccurrenceHighlight": "{{ accent }}40",
+        "minimap.foregroundOpacity": "{{ background }}c0",
+        "minimapSlider.background": "{{ muted }}20",
+        "minimapSlider.hoverBackground": "{{ muted }}40",
+        "minimapSlider.activeBackground": "{{ muted }}60",
+        "minimapGutter.addedBackground": "{{ green }}",
+        "minimapGutter.modifiedBackground": "{{ orange }}",
+        "minimapGutter.deletedBackground": "{{ red }}",
+
+        "editorGroup.border": "{{ muted }}40",
+        "editorGroup.dropBackground": "{{ accent }}20",
+        "editorGroup.dropIntoPromptForeground": "{{ foreground }}",
+        "editorGroup.dropIntoPromptBackground": "{{ background }}",
+        "editorGroup.dropIntoPromptBorder": "{{ accent }}",
+        "editorGroupHeader.noTabsBackground": "{{ background }}",
+        "editorGroupHeader.tabsBackground": "{{ background }}",
+        "editorGroupHeader.tabsBorder": "{{ background }}",
+        "editorGroupHeader.border": "{{ background }}",
+        "editorGroup.emptyBackground": "{{ background }}",
+        "tab.activeBackground": "{{ background }}",
+        "tab.unfocusedActiveBackground": "{{ background }}",
+        "tab.activeForeground": "{{ foreground }}",
+        "tab.activeBorder": "{{ accent }}",
+        "tab.activeBorderTop": "{{ accent }}",
+        "tab.unfocusedActiveBorder": "{{ muted }}",
+        "tab.unfocusedActiveBorderTop": "{{ muted }}",
+        "tab.border": "{{ background }}",
+        "tab.inactiveBackground": "{{ background }}",
+        "tab.inactiveForeground": "{{ muted }}",
+        "tab.unfocusedActiveForeground": "{{ foreground }}",
+        "tab.unfocusedInactiveForeground": "{{ muted }}",
+        "tab.hoverBackground": "{{ muted }}40",
+        "tab.unfocusedHoverBackground": "{{ muted }}40",
+        "tab.hoverForeground": "{{ foreground }}",
+        "tab.hoverBorder": "{{ accent }}40",
+        "tab.activeModifiedBorder": "{{ yellow }}",
+        "tab.inactiveModifiedBorder": "{{ yellow }}80",
+        "tab.unfocusedActiveModifiedBorder": "{{ yellow }}80",
+        "tab.unfocusedInactiveModifiedBorder": "{{ yellow }}60",
+        "tab.lastPinnedBorder": "{{ muted }}",
+        "editorPane.background": "{{ background }}",
+
+        "editor.background": "{{ background }}",
+        "editor.foreground": "{{ foreground }}",
+        "editorLineNumber.foreground": "{{ muted }}",
+        "editorLineNumber.activeForeground": "{{ foreground }}",
+        "editorLineNumber.dimmedForeground": "{{ muted }}80",
+        "editorCursor.background": "{{ background }}",
+        "editorCursor.foreground": "{{ bright_foreground }}",
+        "editor.selectionBackground": "{{ selection_background }}60",
+        "editor.selectionForeground": "{{ selection_foreground }}",
+        "editor.inactiveSelectionBackground": "{{ selection_background }}30",
+        "editor.selectionHighlightBackground": "{{ accent }}20",
+        "editor.selectionHighlightBorder": "{{ accent }}40",
+        "editor.wordHighlightBackground": "{{ accent }}20",
+        "editor.wordHighlightBorder": "{{ accent }}40",
+        "editor.wordHighlightStrongBackground": "{{ accent }}30",
+        "editor.wordHighlightStrongBorder": "{{ accent }}60",
+        "editor.wordHighlightTextBackground": "{{ accent }}15",
+        "editor.wordHighlightTextBorder": "{{ accent }}30",
+        "editor.findMatchBackground": "{{ yellow }}40",
+        "editor.findMatchBorder": "{{ yellow }}",
+        "editor.findMatchHighlightBackground": "{{ yellow }}25",
+        "editor.findMatchHighlightBorder": "{{ yellow }}60",
+        "editor.findRangeHighlightBackground": "{{ accent }}15",
+        "editor.findRangeHighlightBorder": "{{ accent }}30",
+        "searchEditor.findMatchBackground": "{{ yellow }}40",
+        "searchEditor.findMatchBorder": "{{ yellow }}",
+        "editor.hoverHighlightBackground": "{{ accent }}20",
+        "editor.lineHighlightBackground": "{{ background }}60",
+        "editor.lineHighlightBorder": "{{ background }}00",
+        "editorLink.activeForeground": "{{ blue }}",
+        "editor.rangeHighlightBackground": "{{ accent }}10",
+        "editor.rangeHighlightBorder": "{{ accent }}20",
+        "editor.symbolHighlightBackground": "{{ accent }}20",
+        "editor.symbolHighlightBorder": "{{ accent }}40",
+        "editorWhitespace.foreground": "{{ muted }}60",
+        "editorIndentGuide.background1": "{{ muted }}30",
+        "editorIndentGuide.background2": "{{ muted }}30",
+        "editorIndentGuide.background3": "{{ muted }}30",
+        "editorIndentGuide.background4": "{{ muted }}30",
+        "editorIndentGuide.background5": "{{ muted }}30",
+        "editorIndentGuide.background6": "{{ muted }}30",
+        "editorIndentGuide.activeBackground1": "{{ muted }}80",
+        "editorIndentGuide.activeBackground2": "{{ muted }}80",
+        "editorIndentGuide.activeBackground3": "{{ muted }}80",
+        "editorIndentGuide.activeBackground4": "{{ muted }}80",
+        "editorIndentGuide.activeBackground5": "{{ muted }}80",
+        "editorIndentGuide.activeBackground6": "{{ muted }}80",
+        "editorInlayHint.background": "{{ muted }}30",
+        "editorInlayHint.foreground": "{{ muted }}",
+        "editorInlayHint.typeBackground": "{{ yellow }}15",
+        "editorInlayHint.typeForeground": "{{ yellow }}",
+        "editorInlayHint.parameterBackground": "{{ bright_magenta }}15",
+        "editorInlayHint.parameterForeground": "{{ bright_magenta }}",
+        "editorRuler.foreground": "{{ muted }}40",
+        "editorCodeLens.foreground": "{{ muted }}",
+        "editorLightBulb.foreground": "{{ yellow }}",
+        "editorLightBulbAutoFix.foreground": "{{ green }}",
+        "editorLightBulbAi.foreground": "{{ magenta }}",
+        "editorBracketMatch.background": "{{ accent }}30",
+        "editorBracketMatch.border": "{{ accent }}",
+        "editorBracketHighlight.foreground1": "{{ blue }}",
+        "editorBracketHighlight.foreground2": "{{ yellow }}",
+        "editorBracketHighlight.foreground3": "{{ green }}",
+        "editorBracketHighlight.foreground4": "{{ cyan }}",
+        "editorBracketHighlight.foreground5": "{{ magenta }}",
+        "editorBracketHighlight.foreground6": "{{ orange }}",
+        "editorBracketHighlight.unexpectedBracket.foreground": "{{ red }}",
+        "editorBracketPairGuide.activeBackground1": "{{ blue }}60",
+        "editorBracketPairGuide.activeBackground2": "{{ yellow }}60",
+        "editorBracketPairGuide.activeBackground3": "{{ green }}60",
+        "editorBracketPairGuide.activeBackground4": "{{ cyan }}60",
+        "editorBracketPairGuide.activeBackground5": "{{ magenta }}60",
+        "editorBracketPairGuide.activeBackground6": "{{ orange }}60",
+        "editorBracketPairGuide.background1": "{{ blue }}30",
+        "editorBracketPairGuide.background2": "{{ yellow }}30",
+        "editorBracketPairGuide.background3": "{{ green }}30",
+        "editorBracketPairGuide.background4": "{{ cyan }}30",
+        "editorBracketPairGuide.background5": "{{ magenta }}30",
+        "editorBracketPairGuide.background6": "{{ orange }}30",
+        "editorOverviewRuler.background": "{{ background }}",
+        "editorOverviewRuler.border": "{{ muted }}20",
+        "editorOverviewRuler.findMatchForeground": "{{ yellow }}80",
+        "editorOverviewRuler.rangeHighlightForeground": "{{ accent }}60",
+        "editorOverviewRuler.selectionHighlightForeground": "{{ accent }}80",
+        "editorOverviewRuler.wordHighlightForeground": "{{ accent }}60",
+        "editorOverviewRuler.wordHighlightStrongForeground": "{{ accent }}80",
+        "editorOverviewRuler.wordHighlightTextForeground": "{{ accent }}40",
+        "editorOverviewRuler.modifiedForeground": "{{ orange }}80",
+        "editorOverviewRuler.addedForeground": "{{ green }}80",
+        "editorOverviewRuler.deletedForeground": "{{ red }}80",
+        "editorOverviewRuler.errorForeground": "{{ red }}",
+        "editorOverviewRuler.warningForeground": "{{ yellow }}",
+        "editorOverviewRuler.infoForeground": "{{ blue }}",
+        "editorOverviewRuler.bracketMatchForeground": "{{ accent }}",
+        "editorError.foreground": "{{ red }}",
+        "editorError.background": "{{ red }}15",
+        "editorError.border": "{{ red }}00",
+        "editorWarning.foreground": "{{ yellow }}",
+        "editorWarning.background": "{{ yellow }}15",
+        "editorWarning.border": "{{ yellow }}00",
+        "editorInfo.foreground": "{{ blue }}",
+        "editorInfo.background": "{{ blue }}15",
+        "editorInfo.border": "{{ blue }}00",
+        "editorHint.foreground": "{{ cyan }}",
+        "editorHint.border": "{{ cyan }}00",
+        "problemsErrorIcon.foreground": "{{ red }}",
+        "problemsWarningIcon.foreground": "{{ yellow }}",
+        "problemsInfoIcon.foreground": "{{ blue }}",
+        "editorUnnecessaryCode.opacity": "{{ background }}80",
+        "editorUnnecessaryCode.border": "{{ muted }}",
+        "editorGutter.background": "{{ background }}",
+        "editorGutter.modifiedBackground": "{{ orange }}",
+        "editorGutter.addedBackground": "{{ green }}",
+        "editorGutter.deletedBackground": "{{ red }}",
+        "editorGutter.commentRangeForeground": "{{ muted }}",
+        "editorGutter.commentGlyphForeground": "{{ accent }}",
+        "editorGutter.commentUnresolvedGlyphForeground": "{{ yellow }}",
+        "editorGutter.foldingControlForeground": "{{ muted }}",
+        "editorCommentsWidget.resolvedBorder": "{{ green }}",
+        "editorCommentsWidget.unresolvedBorder": "{{ yellow }}",
+        "editorCommentsWidget.rangeBackground": "{{ accent }}10",
+        "editorCommentsWidget.rangeActiveBackground": "{{ accent }}20",
+
+        "diffEditor.insertedTextBackground": "{{ green }}20",
+        "diffEditor.insertedTextBorder": "{{ green }}00",
+        "diffEditor.removedTextBackground": "{{ red }}20",
+        "diffEditor.removedTextBorder": "{{ red }}00",
+        "diffEditor.insertedLineBackground": "{{ green }}15",
+        "diffEditor.removedLineBackground": "{{ red }}15",
+        "diffEditorGutter.insertedLineBackground": "{{ green }}30",
+        "diffEditorGutter.removedLineBackground": "{{ red }}30",
+        "diffEditorOverview.insertedForeground": "{{ green }}80",
+        "diffEditorOverview.removedForeground": "{{ red }}80",
+        "diffEditor.diagonalFill": "{{ muted }}30",
+        "diffEditor.unchangedRegionBackground": "{{ background }}",
+        "diffEditor.unchangedRegionForeground": "{{ muted }}",
+        "diffEditor.unchangedCodeBackground": "{{ background }}40",
+        "diffEditor.move.border": "{{ cyan }}80",
+        "diffEditor.moveActive.border": "{{ cyan }}",
+
+        "editorWidget.foreground": "{{ foreground }}",
+        "editorWidget.background": "{{ background }}",
+        "editorWidget.border": "{{ muted }}",
+        "editorWidget.resizeBorder": "{{ accent }}",
+        "editorSuggestWidget.background": "{{ background }}",
+        "editorSuggestWidget.border": "{{ muted }}",
+        "editorSuggestWidget.foreground": "{{ foreground }}",
+        "editorSuggestWidget.focusHighlightForeground": "{{ accent }}",
+        "editorSuggestWidget.highlightForeground": "{{ accent }}",
+        "editorSuggestWidget.selectedBackground": "{{ accent }}30",
+        "editorSuggestWidget.selectedForeground": "{{ foreground }}",
+        "editorSuggestWidget.selectedIconForeground": "{{ foreground }}",
+        "editorSuggestWidgetStatus.foreground": "{{ muted }}",
+        "editorHoverWidget.foreground": "{{ foreground }}",
+        "editorHoverWidget.background": "{{ background }}",
+        "editorHoverWidget.border": "{{ muted }}",
+        "editorHoverWidget.highlightForeground": "{{ accent }}",
+        "editorHoverWidget.statusBarBackground": "{{ muted }}30",
+        "editorGhostText.foreground": "{{ muted }}",
+        "editorGhostText.background": "{{ muted }}10",
+        "editorGhostText.border": "{{ muted }}00",
+        "editorStickyScroll.background": "{{ background }}",
+        "editorStickyScrollHover.background": "{{ muted }}40",
+        "debugExceptionWidget.background": "{{ red }}20",
+        "debugExceptionWidget.border": "{{ red }}",
+        "editorMarkerNavigation.background": "{{ background }}",
+        "editorMarkerNavigationError.background": "{{ red }}20",
+        "editorMarkerNavigationError.headerBackground": "{{ red }}15",
+        "editorMarkerNavigationWarning.background": "{{ yellow }}20",
+        "editorMarkerNavigationWarning.headerBackground": "{{ yellow }}15",
+        "editorMarkerNavigationInfo.background": "{{ blue }}20",
+        "editorMarkerNavigationInfo.headerBackground": "{{ blue }}15",
+
+        "peekView.border": "{{ accent }}",
+        "peekViewEditor.background": "{{ background }}",
+        "peekViewEditorGutter.background": "{{ background }}",
+        "peekViewEditor.matchHighlightBackground": "{{ yellow }}30",
+        "peekViewEditor.matchHighlightBorder": "{{ yellow }}",
+        "peekViewResult.background": "{{ background }}",
+        "peekViewResult.fileForeground": "{{ foreground }}",
+        "peekViewResult.lineForeground": "{{ muted }}",
+        "peekViewResult.matchHighlightBackground": "{{ yellow }}30",
+        "peekViewResult.selectionBackground": "{{ accent }}30",
+        "peekViewResult.selectionForeground": "{{ foreground }}",
+        "peekViewTitle.background": "{{ background }}",
+        "peekViewTitleDescription.foreground": "{{ muted }}",
+        "peekViewTitleLabel.foreground": "{{ foreground }}",
+
+        "merge.currentContentBackground": "{{ cyan }}20",
+        "merge.currentHeaderBackground": "{{ cyan }}40",
+        "merge.incomingContentBackground": "{{ green }}20",
+        "merge.incomingHeaderBackground": "{{ green }}40",
+        "merge.commonContentBackground": "{{ muted }}20",
+        "merge.commonHeaderBackground": "{{ muted }}40",
+        "merge.border": "{{ muted }}",
+        "editorOverviewRuler.currentContentForeground": "{{ cyan }}",
+        "editorOverviewRuler.incomingContentForeground": "{{ green }}",
+        "editorOverviewRuler.commonContentForeground": "{{ muted }}",
+        "mergeEditor.change.background": "{{ accent }}15",
+        "mergeEditor.change.word.background": "{{ accent }}30",
+        "mergeEditor.conflict.handledUnfocused.border": "{{ green }}80",
+        "mergeEditor.conflict.handled.minimapOverViewRuler": "{{ green }}",
+        "mergeEditor.conflict.unhandledUnfocused.border": "{{ yellow }}80",
+        "mergeEditor.conflict.unhandled.minimapOverViewRuler": "{{ yellow }}",
+        "mergeEditor.conflictingLines.background": "{{ yellow }}15",
+        "mergeEditor.changeBase.background": "{{ muted }}20",
+        "mergeEditor.changeBase.word.background": "{{ muted }}40",
+
+        "panel.background": "{{ background }}",
+        "panel.border": "{{ muted }}40",
+        "panel.dropBorder": "{{ accent }}",
+        "panelTitle.activeBorder": "{{ accent }}",
+        "panelTitle.activeForeground": "{{ foreground }}",
+        "panelTitle.inactiveForeground": "{{ muted }}",
+        "panelInput.border": "{{ muted }}",
+        "panelSection.border": "{{ muted }}40",
+        "panelSection.dropBackground": "{{ accent }}20",
+        "panelSectionHeader.background": "{{ background }}",
+        "panelSectionHeader.foreground": "{{ foreground }}",
+        "panelSectionHeader.border": "{{ muted }}40",
+
+        "outputView.background": "{{ background }}",
+        "outputViewStickyScroll.background": "{{ background }}",
+
+        "statusBar.background": "{{ background }}",
+        "statusBar.foreground": "{{ foreground }}",
+        "statusBar.border": "{{ background }}",
+        "statusBar.debuggingBackground": "{{ yellow }}",
+        "statusBar.debuggingForeground": "{{ background }}",
+        "statusBar.debuggingBorder": "{{ yellow }}",
+        "statusBar.noFolderBackground": "{{ background }}",
+        "statusBar.noFolderForeground": "{{ foreground }}",
+        "statusBar.noFolderBorder": "{{ background }}",
+        "statusBar.focusBorder": "{{ accent }}",
+        "statusBarItem.activeBackground": "{{ muted }}",
+        "statusBarItem.hoverBackground": "{{ muted }}60",
+        "statusBarItem.hoverForeground": "{{ foreground }}",
+        "statusBarItem.prominentForeground": "{{ foreground }}",
+        "statusBarItem.prominentBackground": "{{ accent }}",
+        "statusBarItem.prominentHoverBackground": "{{ accent }}80",
+        "statusBarItem.remoteBackground": "{{ accent }}",
+        "statusBarItem.remoteForeground": "{{ background }}",
+        "statusBarItem.remoteHoverBackground": "{{ accent }}80",
+        "statusBarItem.errorBackground": "{{ red }}",
+        "statusBarItem.errorForeground": "{{ background }}",
+        "statusBarItem.errorHoverBackground": "{{ red }}80",
+        "statusBarItem.warningBackground": "{{ yellow }}",
+        "statusBarItem.warningForeground": "{{ background }}",
+        "statusBarItem.warningHoverBackground": "{{ yellow }}80",
+        "statusBarItem.compactHoverBackground": "{{ muted }}",
+        "statusBarItem.focusBorder": "{{ accent }}",
+
+        "titleBar.activeBackground": "{{ background }}",
+        "titleBar.activeForeground": "{{ foreground }}",
+        "titleBar.inactiveBackground": "{{ background }}",
+        "titleBar.inactiveForeground": "{{ muted }}",
+        "titleBar.border": "{{ background }}",
+
+        "menubar.selectionForeground": "{{ foreground }}",
+        "menubar.selectionBackground": "{{ accent }}30",
+        "menubar.selectionBorder": "{{ accent }}00",
+        "menu.foreground": "{{ foreground }}",
+        "menu.background": "{{ background }}",
+        "menu.selectionForeground": "{{ foreground }}",
+        "menu.selectionBackground": "{{ accent }}30",
+        "menu.selectionBorder": "{{ accent }}00",
+        "menu.separatorBackground": "{{ muted }}",
+        "menu.border": "{{ muted }}",
+
+        "commandCenter.foreground": "{{ foreground }}",
+        "commandCenter.activeForeground": "{{ foreground }}",
+        "commandCenter.background": "{{ background }}",
+        "commandCenter.activeBackground": "{{ muted }}",
+        "commandCenter.border": "{{ muted }}",
+        "commandCenter.inactiveForeground": "{{ muted }}",
+        "commandCenter.inactiveBorder": "{{ muted }}",
+        "commandCenter.activeBorder": "{{ accent }}",
+        "commandCenter.debuggingBackground": "{{ yellow }}20",
+
+        "notificationCenter.border": "{{ muted }}",
+        "notificationCenterHeader.foreground": "{{ foreground }}",
+        "notificationCenterHeader.background": "{{ background }}",
+        "notificationToast.border": "{{ muted }}",
+        "notifications.foreground": "{{ foreground }}",
+        "notifications.background": "{{ background }}",
+        "notifications.border": "{{ muted }}",
+        "notificationLink.foreground": "{{ accent }}",
+        "notificationsErrorIcon.foreground": "{{ red }}",
+        "notificationsWarningIcon.foreground": "{{ yellow }}",
+        "notificationsInfoIcon.foreground": "{{ blue }}",
+
+        "banner.background": "{{ accent }}20",
+        "banner.foreground": "{{ foreground }}",
+        "banner.iconForeground": "{{ accent }}",
+
+        "extensionButton.prominentBackground": "{{ accent }}",
+        "extensionButton.prominentForeground": "{{ background }}",
+        "extensionButton.prominentHoverBackground": "{{ accent }}80",
+        "extensionButton.background": "{{ muted }}",
+        "extensionButton.foreground": "{{ foreground }}",
+        "extensionButton.hoverBackground": "{{ muted }}80",
+        "extensionButton.separator": "{{ background }}",
+        "extensionBadge.remoteBackground": "{{ accent }}",
+        "extensionBadge.remoteForeground": "{{ background }}",
+        "extensionIcon.starForeground": "{{ yellow }}",
+        "extensionIcon.verifiedForeground": "{{ cyan }}",
+        "extensionIcon.preReleaseForeground": "{{ yellow }}",
+        "extensionIcon.sponsorForeground": "{{ magenta }}",
+
+        "pickerGroup.border": "{{ muted }}",
+        "pickerGroup.foreground": "{{ accent }}",
+        "quickInput.background": "{{ background }}",
+        "quickInput.foreground": "{{ foreground }}",
+        "quickInputList.focusBackground": "{{ accent }}30",
+        "quickInputList.focusForeground": "{{ foreground }}",
+        "quickInputList.focusIconForeground": "{{ foreground }}",
+        "quickInputTitle.background": "{{ background }}",
+
+        "keybindingLabel.background": "{{ muted }}40",
+        "keybindingLabel.foreground": "{{ foreground }}",
+        "keybindingLabel.border": "{{ muted }}",
+        "keybindingLabel.bottomBorder": "{{ muted }}",
+        "keybindingTable.headerBackground": "{{ background }}",
+        "keybindingTable.rowsBackground": "{{ background }}40",
+
+        "terminal.background": "{{ background }}",
+        "terminal.foreground": "{{ foreground }}",
+        "terminal.border": "{{ muted }}40",
+        "terminal.selectionBackground": "{{ selection_background }}60",
+        "terminal.selectionForeground": "{{ selection_foreground }}",
+        "terminal.inactiveSelectionBackground": "{{ selection_background }}30",
+        "terminal.findMatchBackground": "{{ yellow }}40",
+        "terminal.findMatchBorder": "{{ yellow }}",
+        "terminal.findMatchHighlightBackground": "{{ yellow }}25",
+        "terminal.findMatchHighlightBorder": "{{ yellow }}60",
+        "terminal.hoverHighlightBackground": "{{ accent }}20",
+        "terminalCursor.background": "{{ background }}",
+        "terminalCursor.foreground": "{{ bright_foreground }}",
+        "terminal.ansiBlack": "{{ background }}",
+        "terminal.ansiRed": "{{ red }}",
+        "terminal.ansiGreen": "{{ green }}",
+        "terminal.ansiYellow": "{{ yellow }}",
+        "terminal.ansiBlue": "{{ blue }}",
+        "terminal.ansiMagenta": "{{ magenta }}",
+        "terminal.ansiCyan": "{{ cyan }}",
+        "terminal.ansiWhite": "{{ foreground }}",
+        "terminal.ansiBrightBlack": "{{ muted }}",
+        "terminal.ansiBrightRed": "{{ bright_red }}",
+        "terminal.ansiBrightGreen": "{{ bright_green }}",
+        "terminal.ansiBrightYellow": "{{ bright_yellow }}",
+        "terminal.ansiBrightBlue": "{{ bright_blue }}",
+        "terminal.ansiBrightMagenta": "{{ bright_magenta }}",
+        "terminal.ansiBrightCyan": "{{ bright_cyan }}",
+        "terminal.ansiBrightWhite": "{{ bright_foreground }}",
+        "terminal.tab.activeBorder": "{{ accent }}",
+        "terminalCommandDecoration.defaultBackground": "{{ muted }}",
+        "terminalCommandDecoration.successBackground": "{{ green }}",
+        "terminalCommandDecoration.errorBackground": "{{ red }}",
+        "terminalOverviewRuler.cursorForeground": "{{ bright_foreground }}",
+        "terminalOverviewRuler.findMatchForeground": "{{ yellow }}",
+        "terminalStickyScroll.background": "{{ background }}",
+        "terminalStickyScrollHover.background": "{{ muted }}40",
+
+        "debugToolBar.background": "{{ background }}",
+        "debugToolBar.border": "{{ muted }}",
+        "debugView.stateLabelForeground": "{{ foreground }}",
+        "debugView.stateLabelBackground": "{{ accent }}30",
+        "debugView.valueChangedHighlight": "{{ cyan }}40",
+        "debugView.exceptionLabelForeground": "{{ background }}",
+        "debugView.exceptionLabelBackground": "{{ red }}",
+        "debugTokenExpression.name": "{{ magenta }}",
+        "debugTokenExpression.value": "{{ foreground }}",
+        "debugTokenExpression.string": "{{ green }}",
+        "debugTokenExpression.boolean": "{{ orange }}",
+        "debugTokenExpression.number": "{{ orange }}",
+        "debugTokenExpression.error": "{{ red }}",
+
+        "testing.iconFailed": "{{ red }}",
+        "testing.iconErrored": "{{ red }}",
+        "testing.iconPassed": "{{ green }}",
+        "testing.runAction": "{{ green }}",
+        "testing.iconQueued": "{{ yellow }}",
+        "testing.iconUnset": "{{ muted }}",
+        "testing.iconSkipped": "{{ yellow }}",
+        "testing.peekBorder": "{{ accent }}",
+        "testing.peekHeaderBackground": "{{ background }}",
+        "testing.message.error.decorationForeground": "{{ red }}",
+        "testing.message.error.lineBackground": "{{ red }}15",
+        "testing.message.info.decorationForeground": "{{ blue }}",
+        "testing.message.info.lineBackground": "{{ blue }}15",
+
+        "welcomePage.background": "{{ background }}",
+        "welcomePage.tileBackground": "{{ background }}",
+        "welcomePage.tileHoverBackground": "{{ muted }}40",
+        "welcomePage.tileBorder": "{{ muted }}",
+        "welcomePage.progress.background": "{{ muted }}",
+        "welcomePage.progress.foreground": "{{ accent }}",
+        "walkThrough.embeddedEditorBackground": "{{ background }}",
+        "walkthrough.stepTitle.foreground": "{{ foreground }}",
+
+        "gitDecoration.addedResourceForeground": "{{ green }}",
+        "gitDecoration.modifiedResourceForeground": "{{ orange }}",
+        "gitDecoration.deletedResourceForeground": "{{ red }}",
+        "gitDecoration.renamedResourceForeground": "{{ cyan }}",
+        "gitDecoration.stageModifiedResourceForeground": "{{ orange }}",
+        "gitDecoration.stageDeletedResourceForeground": "{{ red }}",
+        "gitDecoration.untrackedResourceForeground": "{{ green }}",
+        "gitDecoration.ignoredResourceForeground": "{{ muted }}",
+        "gitDecoration.conflictingResourceForeground": "{{ yellow }}",
+        "gitDecoration.submoduleResourceForeground": "{{ magenta }}",
+
+        "settings.headerForeground": "{{ foreground }}",
+        "settings.modifiedItemIndicator": "{{ accent }}",
+        "settings.dropdownBackground": "{{ background }}",
+        "settings.dropdownForeground": "{{ foreground }}",
+        "settings.dropdownBorder": "{{ muted }}",
+        "settings.dropdownListBorder": "{{ muted }}",
+        "settings.checkboxBackground": "{{ background }}",
+        "settings.checkboxForeground": "{{ foreground }}",
+        "settings.checkboxBorder": "{{ muted }}",
+        "settings.rowHoverBackground": "{{ background }}",
+        "settings.textInputBackground": "{{ background }}",
+        "settings.textInputForeground": "{{ foreground }}",
+        "settings.textInputBorder": "{{ muted }}",
+        "settings.numberInputBackground": "{{ background }}",
+        "settings.numberInputForeground": "{{ foreground }}",
+        "settings.numberInputBorder": "{{ muted }}",
+        "settings.focusedRowBackground": "{{ accent }}10",
+        "settings.focusedRowBorder": "{{ accent }}40",
+        "settings.headerBorder": "{{ muted }}",
+        "settings.sashBorder": "{{ muted }}",
+        "settings.settingsHeaderHoverForeground": "{{ accent }}",
+
+        "breadcrumb.foreground": "{{ muted }}",
+        "breadcrumb.background": "{{ background }}",
+        "breadcrumb.focusForeground": "{{ foreground }}",
+        "breadcrumb.activeSelectionForeground": "{{ foreground }}",
+        "breadcrumbPicker.background": "{{ background }}",
+
+        "editor.snippetTabstopHighlightBackground": "{{ accent }}20",
+        "editor.snippetTabstopHighlightBorder": "{{ accent }}40",
+        "editor.snippetFinalTabstopHighlightBackground": "{{ green }}20",
+        "editor.snippetFinalTabstopHighlightBorder": "{{ green }}40",
+
+        "symbolIcon.arrayForeground": "{{ orange }}",
+        "symbolIcon.booleanForeground": "{{ orange }}",
+        "symbolIcon.classForeground": "{{ yellow }}",
+        "symbolIcon.colorForeground": "{{ cyan }}",
+        "symbolIcon.constantForeground": "{{ bright_yellow }}",
+        "symbolIcon.constructorForeground": "{{ blue }}",
+        "symbolIcon.enumeratorForeground": "{{ yellow }}",
+        "symbolIcon.enumeratorMemberForeground": "{{ orange }}",
+        "symbolIcon.eventForeground": "{{ yellow }}",
+        "symbolIcon.fieldForeground": "{{ foreground }}",
+        "symbolIcon.fileForeground": "{{ foreground }}",
+        "symbolIcon.folderForeground": "{{ foreground }}",
+        "symbolIcon.functionForeground": "{{ blue }}",
+        "symbolIcon.interfaceForeground": "{{ yellow }}",
+        "symbolIcon.keyForeground": "{{ bright_magenta }}",
+        "symbolIcon.keywordForeground": "{{ bright_magenta }}",
+        "symbolIcon.methodForeground": "{{ blue }}",
+        "symbolIcon.moduleForeground": "{{ yellow }}",
+        "symbolIcon.namespaceForeground": "{{ blue }}",
+        "symbolIcon.nullForeground": "{{ orange }}",
+        "symbolIcon.numberForeground": "{{ orange }}",
+        "symbolIcon.objectForeground": "{{ yellow }}",
+        "symbolIcon.operatorForeground": "{{ bright_blue }}",
+        "symbolIcon.packageForeground": "{{ yellow }}",
+        "symbolIcon.propertyForeground": "{{ foreground }}",
+        "symbolIcon.referenceForeground": "{{ bright_magenta }}",
+        "symbolIcon.snippetForeground": "{{ green }}",
+        "symbolIcon.stringForeground": "{{ green }}",
+        "symbolIcon.structForeground": "{{ yellow }}",
+        "symbolIcon.textForeground": "{{ foreground }}",
+        "symbolIcon.typeParameterForeground": "{{ yellow }}",
+        "symbolIcon.unitForeground": "{{ orange }}",
+        "symbolIcon.variableForeground": "{{ bright_magenta }}",
+
+        "debugIcon.breakpointForeground": "{{ red }}",
+        "debugIcon.breakpointDisabledForeground": "{{ muted }}",
+        "debugIcon.breakpointUnverifiedForeground": "{{ yellow }}",
+        "debugIcon.breakpointCurrentStackframeForeground": "{{ yellow }}",
+        "debugIcon.breakpointStackframeForeground": "{{ green }}",
+        "debugIcon.startForeground": "{{ green }}",
+        "debugIcon.pauseForeground": "{{ yellow }}",
+        "debugIcon.stopForeground": "{{ red }}",
+        "debugIcon.disconnectForeground": "{{ red }}",
+        "debugIcon.restartForeground": "{{ green }}",
+        "debugIcon.stepOverForeground": "{{ blue }}",
+        "debugIcon.stepIntoForeground": "{{ cyan }}",
+        "debugIcon.stepOutForeground": "{{ magenta }}",
+        "debugIcon.continueForeground": "{{ green }}",
+        "debugIcon.stepBackForeground": "{{ yellow }}",
+        "debugConsole.infoForeground": "{{ blue }}",
+        "debugConsole.warningForeground": "{{ yellow }}",
+        "debugConsole.errorForeground": "{{ red }}",
+        "debugConsole.sourceForeground": "{{ foreground }}",
+        "debugConsoleInputIcon.foreground": "{{ accent }}",
+
+        "notebook.editorBackground": "{{ background }}",
+        "notebook.cellBorderColor": "{{ muted }}40",
+        "notebook.cellHoverBackground": "{{ background }}40",
+        "notebook.cellInsertionIndicator": "{{ accent }}",
+        "notebook.cellStatusBarItemHoverBackground": "{{ muted }}",
+        "notebook.cellToolbarSeparator": "{{ muted }}",
+        "notebook.cellEditorBackground": "{{ background }}",
+        "notebook.focusedCellBackground": "{{ background }}60",
+        "notebook.focusedCellBorder": "{{ accent }}",
+        "notebook.focusedEditorBorder": "{{ accent }}",
+        "notebook.inactiveFocusedCellBorder": "{{ muted }}",
+        "notebook.inactiveSelectedCellBorder": "{{ muted }}",
+        "notebook.outputContainerBackgroundColor": "{{ background }}",
+        "notebook.outputContainerBorderColor": "{{ muted }}40",
+        "notebook.selectedCellBackground": "{{ accent }}15",
+        "notebook.selectedCellBorder": "{{ accent }}40",
+        "notebook.symbolHighlightBackground": "{{ accent }}20",
+        "notebookStatusErrorIcon.foreground": "{{ red }}",
+        "notebookStatusRunningIcon.foreground": "{{ accent }}",
+        "notebookStatusSuccessIcon.foreground": "{{ green }}",
+        "notebookEditorOverviewRuler.runningCellForeground": "{{ accent }}",
+
+        "charts.foreground": "{{ foreground }}",
+        "charts.lines": "{{ muted }}",
+        "charts.red": "{{ red }}",
+        "charts.blue": "{{ blue }}",
+        "charts.yellow": "{{ yellow }}",
+        "charts.orange": "{{ orange }}",
+        "charts.green": "{{ green }}",
+        "charts.purple": "{{ magenta }}",
+
+        "ports.iconRunningProcessForeground": "{{ accent }}",
+
+        "commentsView.resolvedIcon": "{{ green }}",
+        "commentsView.unresolvedIcon": "{{ yellow }}",
+
+        "editorWatermark.foreground": "{{ muted }}",
+
+        "inlineChat.background": "{{ background }}",
+        "inlineChat.border": "{{ muted }}",
+        "inlineChat.shadow": "{{ background }}80",
+        "inlineChatInput.border": "{{ muted }}",
+        "inlineChatInput.focusBorder": "{{ accent }}",
+        "inlineChatInput.placeholderForeground": "{{ muted }}",
+        "inlineChatInput.background": "{{ background }}",
+        "inlineChatDiff.inserted": "{{ green }}20",
+        "inlineChatDiff.removed": "{{ red }}20",
+
+        "chat.requestBackground": "{{ background }}",
+        "chat.requestBorder": "{{ muted }}"
+    },
+    "tokenColors": [
+        {
+            "name": "Comment",
+            "scope": ["comment", "punctuation.definition.comment"],
+            "settings": {
+                "fontStyle": "italic",
+                "foreground": "{{ muted }}"
+            }
+        },
+        {
+            "name": "Variable",
+            "scope": ["variable", "string constant.other.placeholder"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Variable Parameter",
+            "scope": ["variable.parameter", "entity.name.variable.parameter", "meta.function.parameter"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Variable Property",
+            "scope": ["variable.other.property", "variable.other.object.property"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Variable Constant",
+            "scope": ["variable.other.constant"],
+            "settings": {
+                "foreground": "{{ bright_yellow }}"
+            }
+        },
+        {
+            "name": "Enum Member",
+            "scope": ["variable.other.enummember"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "Invalid",
+            "scope": ["invalid", "invalid.illegal"],
+            "settings": {
+                "foreground": "{{ red }}",
+                "fontStyle": "strikethrough"
+            }
+        },
+        {
+            "name": "Invalid Deprecated",
+            "scope": ["invalid.deprecated"],
+            "settings": {
+                "foreground": "{{ yellow }}",
+                "fontStyle": "strikethrough"
+            }
+        },
+        {
+            "name": "Keyword",
+            "scope": ["keyword", "storage.type.class", "storage.type.function"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "Storage Modifier",
+            "scope": ["storage.modifier"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Keyword Control",
+            "scope": ["keyword.control", "keyword.control.flow"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "Keyword Import",
+            "scope": ["keyword.control.import", "keyword.control.export", "keyword.control.from", "keyword.control.as"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Keyword Operator",
+            "scope": ["keyword.operator", "keyword.operator.new", "keyword.operator.expression", "keyword.operator.logical", "keyword.operator.comparison"],
+            "settings": {
+                "foreground": "{{ bright_blue }}"
+            }
+        },
+        {
+            "name": "Operator",
+            "scope": ["punctuation.accessor", "punctuation.separator.key-value"],
+            "settings": {
+                "foreground": "{{ bright_blue }}"
+            }
+        },
+        {
+            "name": "Type",
+            "scope": ["storage.type", "entity.name.type"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Type Builtin",
+            "scope": ["storage.type.primitive", "support.type"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Type Class",
+            "scope": ["entity.name.type.class", "support.class", "entity.other.inherited-class"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Type Interface",
+            "scope": ["entity.name.type.interface"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Type Enum",
+            "scope": ["entity.name.type.enum"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Type Parameter",
+            "scope": ["entity.name.type.parameter"],
+            "settings": {
+                "foreground": "{{ yellow }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Namespace",
+            "scope": ["entity.name.namespace", "entity.name.type.module"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Function",
+            "scope": ["entity.name.function", "meta.function-call.generic"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Function Builtin",
+            "scope": ["support.function"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Function Method",
+            "scope": ["entity.name.function.method", "meta.method.declaration"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Function Decorator",
+            "scope": ["entity.name.function.decorator", "meta.decorator", "punctuation.decorator"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Punctuation",
+            "scope": ["punctuation", "meta.brace", "meta.bracket"],
+            "settings": {
+                "foreground": "{{ dark_foreground }}"
+            }
+        },
+        {
+            "name": "Constant Numeric",
+            "scope": ["constant.numeric", "constant.numeric.integer", "constant.numeric.float", "constant.numeric.hex", "constant.numeric.octal", "constant.numeric.binary"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "Constant Boolean",
+            "scope": ["constant.language.boolean"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "Constant Builtin",
+            "scope": ["constant.language", "constant.language.null", "constant.language.undefined"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Constant Character",
+            "scope": ["constant.character"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "Constant Character Escape",
+            "scope": ["constant.character.escape"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "String",
+            "scope": ["string", "string.quoted", "string.template"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "String Interpolation",
+            "scope": ["punctuation.definition.template-expression", "punctuation.section.embedded", "meta.embedded.line"],
+            "settings": {
+                "foreground": "{{ bright_blue }}"
+            }
+        },
+        {
+            "name": "String Regexp",
+            "scope": ["string.regexp", "constant.other.character-class.regexp", "constant.character.escape.regexp"],
+            "settings": {
+                "foreground": "{{ bright_cyan }}"
+            }
+        },
+        {
+            "name": "Support",
+            "scope": ["support.type.property-name", "support.constant"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Tag",
+            "scope": ["entity.name.tag", "meta.tag"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Tag Attribute",
+            "scope": ["entity.other.attribute-name"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "CSS Property",
+            "scope": ["support.type.property-name.css", "support.type.vendored.property-name.css", "meta.property-name.css"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "CSS Value",
+            "scope": ["support.constant.property-value.css", "meta.property-value.css"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "CSS Selector",
+            "scope": ["entity.other.attribute-name.class.css", "entity.other.attribute-name.id.css"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "CSS Pseudo",
+            "scope": ["entity.other.attribute-name.pseudo-class.css", "entity.other.attribute-name.pseudo-element.css"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "CSS Units",
+            "scope": ["keyword.other.unit.css"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 0",
+            "scope": ["source.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 1",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 2",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 3",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 4",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 5+",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "Markdown Heading",
+            "scope": ["markup.heading", "entity.name.section.markdown", "punctuation.definition.heading.markdown"],
+            "settings": {
+                "foreground": "{{ blue }}",
+                "fontStyle": "bold"
+            }
+        },
+        {
+            "name": "Markdown Bold",
+            "scope": ["markup.bold", "punctuation.definition.bold.markdown"],
+            "settings": {
+                "foreground": "{{ foreground }}",
+                "fontStyle": "bold"
+            }
+        },
+        {
+            "name": "Markdown Italic",
+            "scope": ["markup.italic", "punctuation.definition.italic.markdown"],
+            "settings": {
+                "foreground": "{{ foreground }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Markdown Link",
+            "scope": ["markup.underline.link", "string.other.link.title.markdown", "string.other.link.description.markdown"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Markdown Code",
+            "scope": ["markup.inline.raw", "markup.fenced_code.block", "markup.raw.block"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "Markdown Quote",
+            "scope": ["markup.quote", "punctuation.definition.quote.begin.markdown"],
+            "settings": {
+                "foreground": "{{ muted }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Markdown List",
+            "scope": ["punctuation.definition.list.begin.markdown", "markup.list.numbered", "markup.list.unnumbered"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Diff Inserted",
+            "scope": ["markup.inserted", "punctuation.definition.inserted"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "Diff Deleted",
+            "scope": ["markup.deleted", "punctuation.definition.deleted"],
+            "settings": {
+                "foreground": "{{ red }}"
+            }
+        },
+        {
+            "name": "Diff Changed",
+            "scope": ["markup.changed", "punctuation.definition.changed"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "This/Self",
+            "scope": ["variable.language.this", "variable.language.self", "variable.language.special.self"],
+            "settings": {
+                "foreground": "{{ foreground }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Object Keys",
+            "scope": ["meta.object-literal.key", "string.unquoted.label.js"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Rust Lifetime",
+            "scope": ["entity.name.type.lifetime.rust", "punctuation.definition.lifetime.rust"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Rust Macro",
+            "scope": ["entity.name.function.macro.rust", "support.function.macro.rust"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Shell Variable",
+            "scope": ["variable.other.normal.shell", "variable.other.positional.shell", "variable.other.bracket.shell"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Shell Command",
+            "scope": ["entity.name.command.shell"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Shell Builtin",
+            "scope": ["support.function.builtin.shell"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "YAML Key",
+            "scope": ["entity.name.tag.yaml"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "TOML Key",
+            "scope": ["keyword.key.toml", "support.type.property-name.toml"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "TOML Table",
+            "scope": ["entity.other.attribute-name.table.toml", "support.type.property-name.table.toml"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "INI Section",
+            "scope": ["entity.name.section.group-title.ini", "punctuation.definition.entity.ini"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "INI Key",
+            "scope": ["keyword.other.definition.ini"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Make Target",
+            "scope": ["entity.name.function.target.makefile"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Make Variable",
+            "scope": ["variable.other.makefile"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Go Package",
+            "scope": ["entity.name.package.go"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Python Self",
+            "scope": ["variable.parameter.function.language.special.self.python"],
+            "settings": {
+                "foreground": "{{ foreground }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Python Magic",
+            "scope": ["support.function.magic.python", "support.variable.magic.python"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "PHP Variable",
+            "scope": ["variable.other.php", "punctuation.definition.variable.php"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "C Preprocessor",
+            "scope": ["meta.preprocessor.c", "meta.preprocessor.include.c", "keyword.control.directive.include.c"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "C# Attribute",
+            "scope": ["meta.attribute.csharp", "entity.name.type.attribute.csharp"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "SQL Keyword",
+            "scope": ["keyword.other.DML.sql", "keyword.other.DDL.sql"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "GraphQL Type",
+            "scope": ["support.type.graphql", "entity.name.type.graphql"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "GraphQL Field",
+            "scope": ["variable.graphql", "variable.other.graphql"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        }
+    ]
+}
diff --git a/mise.toml b/mise.toml
index 3737a4f..84aac9a 100644
--- a/mise.toml
+++ b/mise.toml
@@ -115,6 +115,7 @@ dotfiles.default_mode = "symlink-each"
 "~/.local/bin/omarchy-theme-bg-next" = { source = "script/omarchy-theme-bg-next", mode = "symlink" }
 "~/.local/bin/omarchy-theme-bg-set" = { source = "script/omarchy-theme-bg-set", mode = "symlink" }
 "~/.local/bin/omarchy-theme-colors-from-alacritty" = { source = "script/omarchy-theme-colors-from-alacritty", mode = "symlink" }
+"~/.local/bin/omarchy-theme-color" = { source = "script/omarchy-theme-color", mode = "symlink" }
 "~/.local/bin/omarchy-theme-current" = { source = "script/omarchy-theme-current", mode = "symlink" }
 "~/.local/bin/omarchy-theme-install" = { source = "script/omarchy-theme-install", mode = "symlink" }
 "~/.local/bin/omarchy-theme-list" = { source = "script/omarchy-theme-list", mode = "symlink" }
diff --git a/script/omarchy-theme-color b/script/omarchy-theme-color
new file mode 100755
index 0000000..c5d09ca
--- /dev/null
+++ b/script/omarchy-theme-color
@@ -0,0 +1,304 @@
+#!/bin/bash
+
+# omarchy:summary=Resolve semantic colors from an Omarchy theme colors.toml
+# omarchy:args=[--file <colors.toml>] (--all | --raw | <key> [fallback])
+# omarchy:hidden=true
+
+# Shared colors.toml parser/resolver. The alias/fallback cascade mirrors what
+# omarchy-theme-set-templates bakes into the generated configs at theme-set
+# time, so every consumer (templates, OSC sequences, tmux, GNOME, previews)
+# resolves the exact same palette.
+#
+#   --all            print every resolved key<TAB>value pair (sorted by key)
+#   --raw            print only the key<TAB>value pairs defined in the file
+#   <key> [fallback] print one resolved value; the fallback is tried as
+#                    another palette key first, then used verbatim
+#
+# Theme mode precedence: `mode` key, legacy `theme_type` key, a light.mode
+# file beside the colors.toml, background luminance auto-detect, dark.
+
+COLORS_FILE="$HOME/.local/state/omarchy/current/theme/colors.toml"
+OUTPUT=""
+QUERY_KEY=""
+QUERY_FALLBACK=""
+
+usage() {
+  echo "Usage: omarchy-theme-color [--file <colors.toml>] (--all | --raw | <key> [fallback])"
+}
+
+while (( $# > 0 )); do
+  case "$1" in
+    --file)
+      COLORS_FILE="${2:-}"
+      shift 2
+      ;;
+    --all)
+      OUTPUT="all"
+      shift
+      ;;
+    --raw)
+      OUTPUT="raw"
+      shift
+      ;;
+    -h | --help)
+      usage
+      exit 0
+      ;;
+    *)
+      if [[ -z $QUERY_KEY ]]; then
+        QUERY_KEY="$1"
+      elif [[ -z $QUERY_FALLBACK ]]; then
+        QUERY_FALLBACK="$1"
+      else
+        usage >&2
+        exit 1
+      fi
+      shift
+      ;;
+  esac
+done
+
+if [[ -z $OUTPUT && -z $QUERY_KEY ]] || [[ -n $OUTPUT && -n $QUERY_KEY ]]; then
+  usage >&2
+  exit 1
+fi
+
+COLORS_DIR=$(dirname "$COLORS_FILE")
+
+declare -A THEME_COLORS
+
+# Mix two hex colors. Amount may be a fraction (0.30) or percentage (30%).
+mix_color() {
+  local start="${1#\#}"
+  local end="${2#\#}"
+  local amount="$3"
+
+  awk -v start="$start" -v end="$end" -v amount="$amount" '
+    function hex_value(char) {
+      return index("0123456789abcdef", tolower(char)) - 1
+    }
+
+    function hex_pair_to_int(hex, idx) {
+      return hex_value(substr(hex, idx, 1)) * 16 + hex_value(substr(hex, idx + 1, 1))
+    }
+
+    BEGIN {
+      if (amount ~ /%$/) {
+        sub(/%$/, "", amount)
+        amount = amount / 100
+      } else {
+        amount += 0
+        if (amount > 1) amount = amount / 100
+      }
+
+      if (amount < 0) amount = 0
+      if (amount > 1) amount = 1
+
+      start_r = hex_pair_to_int(start, 1)
+      start_g = hex_pair_to_int(start, 3)
+      start_b = hex_pair_to_int(start, 5)
+      end_r = hex_pair_to_int(end, 1)
+      end_g = hex_pair_to_int(end, 3)
+      end_b = hex_pair_to_int(end, 5)
+
+      red = int(start_r * (1 - amount) + end_r * amount + 0.5)
+      green = int(start_g * (1 - amount) + end_g * amount + 0.5)
+      blue = int(start_b * (1 - amount) + end_b * amount + 0.5)
+
+      printf "#%02x%02x%02x\n", red, green, blue
+    }
+  '
+}
+
+alias_theme_color() {
+  local key="$1"
+  local fallback="$2"
+
+  [[ ${THEME_COLORS[$key]} ]] || THEME_COLORS[$key]="${THEME_COLORS[$fallback]}"
+}
+
+resolve_theme_mode() {
+  local bg_hex lum
+
+  [[ ${THEME_COLORS[mode]} ]] || THEME_COLORS[mode]="${THEME_COLORS[theme_type]}"
+  [[ ${THEME_COLORS[mode]} ]] && return
+
+  if [[ -f $COLORS_DIR/light.mode ]]; then
+    THEME_COLORS[mode]="light"
+  elif [[ ${THEME_COLORS[background]} =~ ^#[0-9A-Fa-f]{6}$ ]]; then
+    bg_hex="${THEME_COLORS[background]#\#}"
+    lum=$(( $(printf "%d" "0x${bg_hex:0:2}") + $(printf "%d" "0x${bg_hex:2:2}") + $(printf "%d" "0x${bg_hex:4:2}") ))
+    (( lum > 382 )) && THEME_COLORS[mode]="light" || THEME_COLORS[mode]="dark"
+  else
+    THEME_COLORS[mode]="dark"
+  fi
+}
+
+parse_colors_file() {
+  local key value
+
+  [[ -f $COLORS_FILE ]] || return 0
+
+  while IFS='=' read -r key value; do
+    key="${key//[\"\' ]/}"                # strip quotes and spaces from key
+    [[ $key && $key != \#* ]] || continue # skip empty lines and comments
+
+    if [[ $value == *[\"\']* ]]; then
+      value="${value#*[\"\']}"
+      value="${value%%[\"\']*}" # extract value between quotes (ignores inline comments)
+    else
+      value="${value#"${value%%[![:space:]]*}"}"
+      value="${value%"${value##*[![:space:]]}"}" # trim unquoted values
+    fi
+
+    # Values reach consumers as sed replacement text, so the charset excludes
+    # the delimiter, backslash, and & while still covering everything a real
+    # palette holds: hex, rgb()/rgba() lists, gradient angles like -45deg,
+    # decimals, and bare words. Rejections are announced so a third-party theme
+    # doesn't lose a key silently and leave a raw {{ placeholder }} behind.
+    if [[ ! $key =~ ^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-]+$ ]]; then
+      printf 'omarchy-theme-color: skipping key with unsupported characters\n' >&2
+      continue
+    fi
+
+    if [[ ! $value =~ ^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789#(),._+/%\ -]*$ ]]; then
+      printf 'omarchy-theme-color: skipping %s: unsupported characters in value\n' "$key" >&2
+      continue
+    fi
+
+    THEME_COLORS[$key]="$value"
+    [[ $OUTPUT == "raw" ]] && printf '%s\t%s\n' "$key" "$value"
+  done <"$COLORS_FILE"
+
+  return 0
+}
+
+resolve_theme_colors() {
+  local key
+
+  # Accept the complete legacy short-name palette before applying ANSI
+  # fallbacks or deriving shades. Canonical names take precedence when a theme
+  # defines both forms.
+  declare -A legacy_palette_alias=(
+    [background]=bg
+    [dark_background]=dark_bg
+    [darker_background]=darker_bg
+    [lighter_background]=lighter_bg
+    [foreground]=fg
+    [dark_foreground]=dark_fg
+    [light_foreground]=light_fg
+    [bright_foreground]=bright_fg
+  )
+  for key in "${!legacy_palette_alias[@]}"; do
+    alias_theme_color "$key" "${legacy_palette_alias[$key]}"
+  done
+
+  # Themes generated before the semantic palette may only define ANSI names.
+  [[ ${THEME_COLORS[background]} ]] || THEME_COLORS[background]="${THEME_COLORS[color0]}"
+  [[ ${THEME_COLORS[foreground]} ]] || THEME_COLORS[foreground]="${THEME_COLORS[color7]}"
+  [[ ${THEME_COLORS[background]} ]] && THEME_COLORS[color0]="${THEME_COLORS[background]}"
+  [[ ${THEME_COLORS[foreground]} ]] && THEME_COLORS[color7]="${THEME_COLORS[foreground]}"
+
+  # Legacy compatibility: map ANSI color0..color15 to semantic names.
+  declare -A legacy_alias=(
+    [red]=color1
+    [green]=color2
+    [yellow]=color3
+    [blue]=color4
+    [magenta]=color5
+    [cyan]=color6
+    [bright_red]=color9
+    [bright_green]=color10
+    [bright_yellow]=color11
+    [bright_blue]=color12
+    [bright_magenta]=color13
+    [bright_cyan]=color14
+  )
+  for key in "${!legacy_alias[@]}"; do
+    alias_theme_color "$key" "${legacy_alias[$key]}"
+  done
+  alias_theme_color magenta purple
+  alias_theme_color bright_magenta bright_purple
+
+  [[ ${THEME_COLORS[light_foreground]} ]]  || THEME_COLORS[light_foreground]="${THEME_COLORS[color7]:-${THEME_COLORS[foreground]}}"
+  [[ ${THEME_COLORS[bright_foreground]} ]] || THEME_COLORS[bright_foreground]="${THEME_COLORS[color15]:-${THEME_COLORS[foreground]}}"
+  THEME_COLORS[cursor]="${THEME_COLORS[bright_foreground]}"
+  [[ ${THEME_COLORS[lighter_background]} ]] || THEME_COLORS[lighter_background]="${THEME_COLORS[color0]:-${THEME_COLORS[background]}}"
+  [[ ${THEME_COLORS[dark_foreground]} ]]    || THEME_COLORS[dark_foreground]="${THEME_COLORS[color8]:-${THEME_COLORS[foreground]}}"
+  [[ ${THEME_COLORS[muted]} ]]      || THEME_COLORS[muted]="${THEME_COLORS[color8]:-${THEME_COLORS[dark_foreground]}}"
+  [[ ${THEME_COLORS[selection]} ]]            || THEME_COLORS[selection]="${THEME_COLORS[selection_background]:-${THEME_COLORS[color8]:-${THEME_COLORS[color0]:-${THEME_COLORS[background]}}}}"
+  [[ ${THEME_COLORS[selection_background]} ]] || THEME_COLORS[selection_background]="${THEME_COLORS[selection]}"
+  [[ ${THEME_COLORS[selection_foreground]} ]] || THEME_COLORS[selection_foreground]="${THEME_COLORS[bright_foreground]}"
+  [[ ${THEME_COLORS[orange]} ]]               || THEME_COLORS[orange]="${THEME_COLORS[yellow]}"
+  [[ ${THEME_COLORS[brown]} ]]      || THEME_COLORS[brown]=$(mix_color "${THEME_COLORS[orange]}" "#000000" 50%)
+
+  # Auto-derive shades from base accents when not defined and not aliased from colorN
+  [[ ${THEME_COLORS[dark_background]} ]]   || THEME_COLORS[dark_background]=$(mix_color "${THEME_COLORS[background]}" "#000000" 25%)
+  [[ ${THEME_COLORS[darker_background]} ]] || THEME_COLORS[darker_background]=$(mix_color "${THEME_COLORS[background]}" "#000000" 50%)
+  [[ ${THEME_COLORS[bright_red]} ]]    || THEME_COLORS[bright_red]=$(mix_color "${THEME_COLORS[red]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_yellow]} ]] || THEME_COLORS[bright_yellow]=$(mix_color "${THEME_COLORS[yellow]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_green]} ]]  || THEME_COLORS[bright_green]=$(mix_color "${THEME_COLORS[green]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_cyan]} ]]   || THEME_COLORS[bright_cyan]=$(mix_color "${THEME_COLORS[cyan]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_blue]} ]]   || THEME_COLORS[bright_blue]=$(mix_color "${THEME_COLORS[blue]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_magenta]} ]] || THEME_COLORS[bright_magenta]=$(mix_color "${THEME_COLORS[magenta]}" "#ffffff" 20%)
+  alias_theme_color purple magenta
+  alias_theme_color bright_purple bright_magenta
+
+  # Keep semantic themes compatible with consumers that still reference the
+  # legacy ANSI names directly.
+  declare -A ansi_alias=(
+    [color0]=background
+    [color1]=red
+    [color2]=green
+    [color3]=yellow
+    [color4]=blue
+    [color5]=magenta
+    [color6]=cyan
+    [color7]=foreground
+    [color8]=muted
+    [color9]=bright_red
+    [color10]=bright_green
+    [color11]=bright_yellow
+    [color12]=bright_blue
+    [color13]=bright_magenta
+    [color14]=bright_cyan
+    [color15]=bright_foreground
+  )
+  for key in "${!ansi_alias[@]}"; do
+    alias_theme_color "$key" "${ansi_alias[$key]}"
+  done
+
+  # Keep canonical themes compatible with old user templates and consumers
+  # that still query the short palette names directly.
+  for key in "${!legacy_palette_alias[@]}"; do
+    if [[ ${THEME_COLORS[$key]} ]]; then
+      THEME_COLORS["${legacy_palette_alias[$key]}"]="${THEME_COLORS[$key]}"
+    fi
+  done
+
+  resolve_theme_mode
+  THEME_COLORS[theme_type]="${THEME_COLORS[mode]}"
+}
+
+parse_colors_file
+
+if [[ $OUTPUT == "raw" ]]; then
+  exit 0
+fi
+
+resolve_theme_colors
+
+if [[ $OUTPUT == "all" ]]; then
+  while IFS= read -r key; do
+    printf '%s\t%s\n' "$key" "${THEME_COLORS[$key]}"
+  done < <(printf '%s\n' "${!THEME_COLORS[@]}" | LC_ALL=C sort)
+  exit 0
+fi
+
+value="${THEME_COLORS[$QUERY_KEY]:-}"
+if [[ -z $value && -n $QUERY_FALLBACK ]]; then
+  value="${THEME_COLORS[$QUERY_FALLBACK]:-$QUERY_FALLBACK}"
+fi
+
+[[ -n $value ]] || exit 1
+printf '%s\n' "$value"
diff --git a/script/omarchy-theme-set-templates b/script/omarchy-theme-set-templates
index fccb9dc..85548fc 100755
--- a/script/omarchy-theme-set-templates
+++ b/script/omarchy-theme-set-templates
@@ -7,7 +7,8 @@ TEMPLATES_DIR="$DOTFILES_DIR/default/themed"
 USER_TEMPLATES_DIR="$HOME/.config/omarchy/themed"
 NEXT_THEME_DIR="$HOME/.local/state/omarchy/current/next-theme"
 COLORS_FILE="$NEXT_THEME_DIR/colors.toml"
-THEME_MODE="$NEXT_THEME_DIR/light.mode"
+
+declare -A THEME_COLORS
 
 # Convert hex color to decimal RGB (e.g., "#1e1e2e" -> "30,30,46")
 hex_to_rgb() {
@@ -15,35 +16,379 @@ hex_to_rgb() {
   printf "%d,%d,%d" "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
 }
 
+# Mix two hex colors. Amount may be a fraction (0.30) or percentage (30%).
+mix_color() {
+  local start="${1#\#}"
+  local end="${2#\#}"
+  local amount="$3"
+
+  awk -v start="$start" -v end="$end" -v amount="$amount" '
+    function hex_value(char) {
+      return index("0123456789abcdef", tolower(char)) - 1
+    }
+
+    function hex_pair_to_int(hex, idx) {
+      return hex_value(substr(hex, idx, 1)) * 16 + hex_value(substr(hex, idx + 1, 1))
+    }
+
+    BEGIN {
+      if (amount ~ /%$/) {
+        sub(/%$/, "", amount)
+        amount = amount / 100
+      } else {
+        amount += 0
+        if (amount > 1) amount = amount / 100
+      }
+
+      if (amount < 0) amount = 0
+      if (amount > 1) amount = 1
+
+      start_r = hex_pair_to_int(start, 1)
+      start_g = hex_pair_to_int(start, 3)
+      start_b = hex_pair_to_int(start, 5)
+      end_r = hex_pair_to_int(end, 1)
+      end_g = hex_pair_to_int(end, 3)
+      end_b = hex_pair_to_int(end, 5)
+
+      red = int(start_r * (1 - amount) + end_r * amount + 0.5)
+      green = int(start_g * (1 - amount) + end_g * amount + 0.5)
+      blue = int(start_b * (1 - amount) + end_b * amount + 0.5)
+
+      printf "#%02x%02x%02x\n", red, green, blue
+    }
+  '
+}
+
+trim() {
+  local value="$1"
+
+  value="${value#"${value%%[![:space:]]*}"}"
+  value="${value%"${value##*[![:space:]]}"}"
+  printf "%s" "$value"
+}
+
+resolve_theme_ref() {
+  local ref="$1"
+  local fallback="${2:-}"
+
+  if [[ -n ${THEME_COLORS[$ref]+_} ]]; then
+    printf "%s" "${THEME_COLORS[$ref]}"
+  elif [[ -n $fallback && -n ${THEME_COLORS[$fallback]+_} ]]; then
+    printf "%s" "${THEME_COLORS[$fallback]}"
+  elif [[ -n $fallback ]]; then
+    printf "%s" "$fallback"
+  else
+    printf "%s" "$ref"
+  fi
+}
+
+resolve_gradient_color() {
+  local color
+
+  color=$(trim "$1")
+  if [[ -n ${THEME_COLORS[$color]+_} ]]; then
+    color="${THEME_COLORS[$color]}"
+  fi
+
+  printf "%s" "$color"
+}
+
+parse_gradient() {
+  local spec="$1"
+  local part color
+  local -a parts
+
+  GRADIENT_COLORS=()
+  GRADIENT_ANGLE=""
+
+  read -ra parts <<<"$spec"
+  for part in "${parts[@]}"; do
+    [[ -n $part ]] || continue
+
+    if [[ $part =~ ^-?[0-9]+([.][0-9]+)?deg$ ]]; then
+      GRADIENT_ANGLE="${part%deg}"
+    else
+      color=$(resolve_gradient_color "$part")
+      GRADIENT_COLORS+=("$color")
+    fi
+  done
+}
+
+color_to_shell_hex() {
+  local color r g b
+
+  color=$(resolve_gradient_color "$1")
+
+  if [[ $color =~ ^#[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$ ]]; then
+    printf "#%s" "${color:1:6}"
+  elif [[ $color =~ ^[Rr][Gg][Bb][Aa]?\(([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?\)$ ]]; then
+    printf "#%s" "${BASH_REMATCH[1]}"
+  elif [[ $color =~ ^[Rr][Gg][Bb][Aa]?\(([0-9]+),([0-9]+),([0-9]+)(,[0-9.]+)?\)$ ]]; then
+    r=${BASH_REMATCH[1]}
+    g=${BASH_REMATCH[2]}
+    b=${BASH_REMATCH[3]}
+    (( r > 255 )) && r=255
+    (( g > 255 )) && g=255
+    (( b > 255 )) && b=255
+    printf "#%02x%02x%02x" "$r" "$g" "$b"
+  elif [[ $color =~ ^0x[0-9A-Fa-f]{8}$ ]]; then
+    printf "#%s" "${color:4:6}"
+  else
+    printf "%s" "$color"
+  fi
+}
+
+hypr_gradient_value() {
+  local spec color index
+
+  spec=$(resolve_theme_ref "$1" "${2:-}")
+  parse_gradient "$spec"
+
+  if (( ${#GRADIENT_COLORS[@]} == 0 )); then
+    printf '"%s"' "$spec"
+  elif (( ${#GRADIENT_COLORS[@]} == 1 )); then
+    printf '"%s"' "${GRADIENT_COLORS[0]}"
+  else
+    printf '{ colors = {'
+    for index in "${!GRADIENT_COLORS[@]}"; do
+      (( index > 0 )) && printf ','
+      printf ' "%s"' "${GRADIENT_COLORS[$index]}"
+    done
+    printf ' }'
+    [[ -n $GRADIENT_ANGLE ]] && printf ', angle = %s' "$GRADIENT_ANGLE"
+    printf ' }'
+  fi
+}
+
+gradient_start_value() {
+  local spec
+
+  spec=$(resolve_theme_ref "$1" "${2:-}")
+  parse_gradient "$spec"
+
+  if (( ${#GRADIENT_COLORS[@]} == 0 )); then
+    color_to_shell_hex "$spec"
+  else
+    color_to_shell_hex "${GRADIENT_COLORS[0]}"
+  fi
+}
+
+shell_gradient_value() {
+  local spec index
+
+  spec=$(resolve_theme_ref "$1" "${2:-}")
+  parse_gradient "$spec"
+
+  if (( ${#GRADIENT_COLORS[@]} == 0 )); then
+    printf "%s" "$spec"
+    return
+  fi
+
+  for index in "${!GRADIENT_COLORS[@]}"; do
+    (( index > 0 )) && printf " "
+    printf "%s" "${GRADIENT_COLORS[$index]}"
+  done
+
+  [[ -n $GRADIENT_ANGLE ]] && printf " %sdeg" "$GRADIENT_ANGLE"
+}
+
+add_template_value() {
+  local key="$1"
+  local value="$2"
+  local rgb
+
+  printf 's|{{ %s }}|%s|g\n' "$key" "$value" >>"$sed_script"
+  printf 's|{{ %s_strip }}|%s|g\n' "$key" "${value#\#}" >>"$sed_script"
+
+  if [[ $value =~ ^#[0-9A-Fa-f]{6}$ ]]; then
+    rgb=$(hex_to_rgb "$value")
+    printf 's|{{ %s_rgb }}|%s|g\n' "$key" "$rgb" >>"$sed_script"
+  fi
+}
+
+add_mix_value() {
+  local token="$1"
+  local content fn start_key end_key amount start end value
+
+  content="${token#\{\{}"
+  content="${content%\}\}}"
+  read -r fn start_key end_key amount <<<"$content"
+
+  start="${THEME_COLORS[$start_key]:-}"
+  end="${THEME_COLORS[$end_key]:-}"
+
+  [[ $start =~ ^#[0-9A-Fa-f]{6}$ && $end =~ ^#[0-9A-Fa-f]{6}$ ]] || return
+
+  value=$(mix_color "$start" "$end" "$amount")
+
+  case "$fn" in
+    mix)
+      ;;
+    mix_strip)
+      value="${value#\#}"
+      ;;
+    mix_rgb)
+      value=$(hex_to_rgb "$value")
+      ;;
+    *)
+      return
+      ;;
+  esac
+
+  printf 's|%s|%s|g\n' "$token" "$value" >>"$sed_script"
+}
+
+add_mix_values() {
+  local tpl token
+  local -A seen=()
+
+  for tpl in "${template_files[@]}"; do
+    while IFS= read -r token; do
+      [[ -n ${seen[$token]:-} ]] && continue
+      seen[$token]=1
+      add_mix_value "$token"
+    done < <(grep -hEo '\{\{[[:space:]]*mix(_strip|_rgb)?[[:space:]]+[A-Za-z0-9_]+[[:space:]]+[A-Za-z0-9_]+[[:space:]]+[0-9]+([.][0-9]+)?%?[[:space:]]*\}\}' "$tpl" 2>/dev/null || true)
+  done
+}
+
+add_gradient_function_value() {
+  local token="$1"
+  local content fn key fallback value
+
+  content="${token#\{\{}"
+  content="${content%\}\}}"
+  read -r fn key fallback <<<"$content"
+
+  case "$fn" in
+    hypr_gradient)
+      value=$(hypr_gradient_value "$key" "$fallback")
+      ;;
+    gradient_start)
+      value=$(gradient_start_value "$key" "$fallback")
+      ;;
+    shell_gradient)
+      value=$(shell_gradient_value "$key" "$fallback")
+      ;;
+    *)
+      return
+      ;;
+  esac
+
+  printf 's|%s|%s|g\n' "$token" "$value" >>"$sed_script"
+}
+
+add_gradient_function_values() {
+  local tpl token
+  local -A seen=()
+
+  for tpl in "${template_files[@]}"; do
+    while IFS= read -r token; do
+      [[ -n ${seen[$token]:-} ]] && continue
+      seen[$token]=1
+      add_gradient_function_value "$token"
+    done < <(grep -hEo '\{\{[[:space:]]*(hypr_gradient|gradient_start|shell_gradient)[[:space:]]+[^}]+[[:space:]]*\}\}' "$tpl" 2>/dev/null || true)
+  done
+}
+
+strip_shell_section_header() {
+  local section="$1"
+  local file="$2"
+
+  awk -v section="$section" '
+    BEGIN { skipping_header = 0 }
+    /^[[:space:]]*\[[^]]+\][[:space:]]*($|#)/ {
+      if ($0 ~ "^[[:space:]]*\\[" section "\\][[:space:]]*($|#)") {
+        skipping_header = 1
+        next
+      }
+    }
+    { print }
+  ' "$file"
+}
+
+apply_shell_section_override() {
+  local override="$1"
+  local section tmp body
+
+  [[ -f $NEXT_THEME_DIR/shell.toml ]] || return
+  [[ -f $override ]] || return
+
+  section=$(basename "$override")
+  section="${section#shell.}"
+  section="${section%.toml}"
+  [[ $section =~ ^[A-Za-z0-9_-]+$ ]] || return
+
+  tmp=$(mktemp)
+  body=$(mktemp)
+
+  strip_shell_section_header "$section" "$override" >"$body"
+
+  awk -v section="$section" -v body="$body" '
+    function emit_override() {
+      if (emitted) return
+      print "[" section "]"
+      while ((getline line < body) > 0) print line
+      close(body)
+      emitted = 1
+    }
+
+    /^[[:space:]]*\[[^]]+\][[:space:]]*($|#)/ {
+      if (in_section) {
+        emit_override()
+        in_section = 0
+      }
+      if ($0 ~ "^[[:space:]]*\\[" section "\\][[:space:]]*($|#)") {
+        in_section = 1
+        next
+      }
+    }
+
+    !in_section { print }
+
+    END {
+      if (in_section || !emitted) {
+        if (NR > 0) print ""
+        emit_override()
+      }
+    }
+  ' "$NEXT_THEME_DIR/shell.toml" >"$tmp"
+
+  mv "$tmp" "$NEXT_THEME_DIR/shell.toml"
+  rm "$body"
+}
+
+apply_shell_section_overrides() {
+  local override
+
+  shopt -s nullglob
+  for override in "$NEXT_THEME_DIR"/shell.*.toml; do
+    [[ $(basename "$override") != "shell.toml" ]] || continue
+    apply_shell_section_override "$override"
+  done
+}
+
 # Only generate dynamic templates for themes with a colors.toml definition
 if [[ -f $COLORS_FILE ]]; then
   sed_script=$(mktemp)
 
-  key="theme_mode";
-  if [[ -f $THEME_MODE ]]; then
-    printf 's|{{ %s }}|%s|g\n' "$key" "light"            # {{ key }} -> value
-  else
-    printf 's|{{ %s }}|%s|g\n' "$key" "dark"            # {{ key }} -> value
-  fi >"$sed_script"
-
-  while IFS='=' read -r key value; do
-    key="${key//[\"\' ]/}"                # strip quotes and spaces from key
-    [[ $key && $key != \#* ]] || continue # skip empty lines and comments
-    value="${value#*[\"\']}"
-    value="${value%%[\"\']*}" # extract value between quotes (ignores inline comments)
-
-    printf 's|{{ %s }}|%s|g\n' "$key" "$value"            # {{ key }} -> value
-    printf 's|{{ %s_strip }}|%s|g\n' "$key" "${value#\#}" # {{ key_strip }} -> value without leading #
-    if [[ $value =~ ^# ]]; then
-      rgb=$(hex_to_rgb "$value")
-      echo "s|{{ ${key}_rgb }}|${rgb}|g"
-    fi
-  done <"$COLORS_FILE" >>"$sed_script"
-
   shopt -s nullglob
+  template_files=("$USER_TEMPLATES_DIR"/*.tpl "$TEMPLATES_DIR"/*.tpl)
+
+  # Parsing and alias/fallback resolution (legacy colorN names, derived
+  # shades, mode/theme_type) is shared with every other colors.toml consumer.
+  while IFS=$'\t' read -r key value; do
+    THEME_COLORS[$key]="$value"
+  done < <(omarchy-theme-color --file "$COLORS_FILE" --all)
+
+  for key in "${!THEME_COLORS[@]}"; do
+    add_template_value "$key" "${THEME_COLORS[$key]}"
+  done
+
+  add_mix_values
+  add_gradient_function_values
 
   # Process user templates first, then built-in templates (user overrides built-in)
-  for tpl in "$USER_TEMPLATES_DIR"/*.tpl "$TEMPLATES_DIR"/*.tpl; do
+  for tpl in "${template_files[@]}"; do
     filename=$(basename "$tpl" .tpl)
     output_path="$NEXT_THEME_DIR/$filename"
 
@@ -55,3 +400,5 @@ if [[ -f $COLORS_FILE ]]; then
 
   rm "$sed_script"
 fi
+
+apply_shell_section_overrides
diff --git a/themes/catppuccin-latte/backgrounds/1-color-fade.webp b/themes/catppuccin-latte/backgrounds/1-color-fade.webp
new file mode 100644
index 0000000..c3bb705
Binary files /dev/null and b/themes/catppuccin-latte/backgrounds/1-color-fade.webp differ
diff --git a/themes/catppuccin-latte/backgrounds/omarchy.webp b/themes/catppuccin-latte/backgrounds/omarchy.webp
new file mode 100644
index 0000000..4a35c76
Binary files /dev/null and b/themes/catppuccin-latte/backgrounds/omarchy.webp differ
diff --git a/themes/catppuccin-latte/colors.toml b/themes/catppuccin-latte/colors.toml
index 87c37d4..b5775f2 100644
--- a/themes/catppuccin-latte/colors.toml
+++ b/themes/catppuccin-latte/colors.toml
@@ -1,23 +1,31 @@
-accent = "#1e66f5"
-cursor = "#dc8a78"
-foreground = "#4c4f69"
-background = "#eff1f5"
-selection_foreground = "#eff1f5"
-selection_background = "#dc8a78"
+mode = "light"
 
-color0 = "#bcc0cc"
-color1 = "#d20f39"
-color2 = "#40a02b"
-color3 = "#df8e1d"
-color4 = "#1e66f5"
-color5 = "#ea76cb"
-color6 = "#179299"
-color7 = "#5c5f77"
-color8 = "#acb0be"
-color9 = "#d20f39"
-color10 = "#40a02b"
-color11 = "#df8e1d"
-color12 = "#1e66f5"
-color13 = "#ea76cb"
-color14 = "#179299"
-color15 = "#6c6f85"
+accent = "#1e66f5"
+selection = "#ccd0da"
+muted = "#acb0be"
+
+background = "#eff1f5"
+dark_background = "#e3e4e8"
+darker_background = "#d7d8dc"
+lighter_background = "#dce0e8"
+
+foreground = "#4c4f69"
+dark_foreground = "#9ca0b0"
+light_foreground = "#5c5f77"
+bright_foreground = "#4c4f69"
+
+red = "#d20f39"
+yellow = "#df8e1d"
+orange = "#d84e2b"
+green = "#40a02b"
+cyan = "#179299"
+blue = "#1e66f5"
+magenta = "#ea76cb"
+brown = "#6c2715"
+
+bright_red = "#d20f39"
+bright_yellow = "#df8e1d"
+bright_green = "#40a02b"
+bright_cyan = "#179299"
+bright_blue = "#1e66f5"
+bright_magenta = "#ea76cb"
diff --git a/themes/catppuccin/backgrounds/1-totoro.webp b/themes/catppuccin/backgrounds/1-totoro.webp
new file mode 100644
index 0000000..7005d31
Binary files /dev/null and b/themes/catppuccin/backgrounds/1-totoro.webp differ
diff --git a/themes/catppuccin/backgrounds/2-waves.webp b/themes/catppuccin/backgrounds/2-waves.webp
new file mode 100644
index 0000000..a7cc4d4
Binary files /dev/null and b/themes/catppuccin/backgrounds/2-waves.webp differ
diff --git a/themes/catppuccin/backgrounds/3-blue-eye.webp b/themes/catppuccin/backgrounds/3-blue-eye.webp
new file mode 100644
index 0000000..5030f36
Binary files /dev/null and b/themes/catppuccin/backgrounds/3-blue-eye.webp differ
diff --git a/themes/catppuccin/backgrounds/omarchy.webp b/themes/catppuccin/backgrounds/omarchy.webp
new file mode 100644
index 0000000..892c957
Binary files /dev/null and b/themes/catppuccin/backgrounds/omarchy.webp differ
diff --git a/themes/catppuccin/colors.toml b/themes/catppuccin/colors.toml
index 6943ef1..ee62f93 100644
--- a/themes/catppuccin/colors.toml
+++ b/themes/catppuccin/colors.toml
@@ -1,23 +1,31 @@
-accent = "#89b4fa"
-cursor = "#f5e0dc"
-foreground = "#cdd6f4"
-background = "#1e1e2e"
-selection_foreground = "#1e1e2e"
-selection_background = "#f5e0dc"
+mode = "dark"
 
-color0 = "#45475a"
-color1 = "#f38ba8"
-color2 = "#a6e3a1"
-color3 = "#f9e2af"
-color4 = "#89b4fa"
-color5 = "#f5c2e7"
-color6 = "#94e2d5"
-color7 = "#bac2de"
-color8 = "#585b70"
-color9 = "#f38ba8"
-color10 = "#a6e3a1"
-color11 = "#f9e2af"
-color12 = "#89b4fa"
-color13 = "#f5c2e7"
-color14 = "#94e2d5"
-color15 = "#a6adc8"
+accent = "#89b4fa"
+selection = "#45475a"
+muted = "#585b70"
+
+background = "#1e1e2e"
+dark_background = "#161622"
+darker_background = "#101019"
+lighter_background = "#313244"
+
+foreground = "#cdd6f4"
+dark_foreground = "#6c7086"
+light_foreground = "#bac2de"
+bright_foreground = "#cdd6f4"
+
+red = "#f38ba8"
+yellow = "#f9e2af"
+orange = "#f6b6ab"
+green = "#a6e3a1"
+cyan = "#94e2d5"
+blue = "#89b4fa"
+magenta = "#f5c2e7"
+brown = "#7b5b55"
+
+bright_red = "#f38ba8"
+bright_yellow = "#f9e2af"
+bright_green = "#a6e3a1"
+bright_cyan = "#94e2d5"
+bright_blue = "#89b4fa"
+bright_magenta = "#f5c2e7"
diff --git a/themes/ethereal/backgrounds/1-cosmic.webp b/themes/ethereal/backgrounds/1-cosmic.webp
new file mode 100644
index 0000000..3f25e6b
Binary files /dev/null and b/themes/ethereal/backgrounds/1-cosmic.webp differ
diff --git a/themes/ethereal/backgrounds/2-meadow.webp b/themes/ethereal/backgrounds/2-meadow.webp
new file mode 100644
index 0000000..b605544
Binary files /dev/null and b/themes/ethereal/backgrounds/2-meadow.webp differ
diff --git a/themes/ethereal/backgrounds/omarchy.webp b/themes/ethereal/backgrounds/omarchy.webp
new file mode 100644
index 0000000..70b6d74
Binary files /dev/null and b/themes/ethereal/backgrounds/omarchy.webp differ
diff --git a/themes/ethereal/colors.toml b/themes/ethereal/colors.toml
index dbce1ae..88d967e 100644
--- a/themes/ethereal/colors.toml
+++ b/themes/ethereal/colors.toml
@@ -1,23 +1,31 @@
-accent = "#7d82d9"
-cursor = "#ffcead"
-foreground = "#ffcead"
-background = "#060B1E"
-selection_foreground = "#060B1E"
-selection_background = "#ffcead"
+mode = "dark"
 
-color0 = "#3C486D"
-color1 = "#ED5B5A"
-color2 = "#92a593"
-color3 = "#E9BB4F"
-color4 = "#7d82d9"
-color5 = "#c89dc1"
-color6 = "#a3bfd1"
-color7 = "#F99957"
-color8 = "#6d7db6"
-color9 = "#faaaa9"
-color10 = "#c4cfc4"
-color11 = "#f7dc9c"
-color12 = "#c2c4f0"
-color13 = "#ead7e7"
-color14 = "#dfeaf0"
-color15 = "#ffcead"
+accent = "#7d82d9"
+selection = "#252e56"
+muted = "#6d7db6"
+
+background = "#060B1E"
+dark_background = "#040816"
+darker_background = "#030610"
+lighter_background = "#131a3a"
+
+foreground = "#ffcead"
+dark_foreground = "#6d7db6"
+light_foreground = "#c9b8a6"
+bright_foreground = "#ffcead"
+
+red = "#ED5B5A"
+yellow = "#E9BB4F"
+orange = "#eb8b54"
+green = "#92a593"
+cyan = "#a3bfd1"
+blue = "#7d82d9"
+magenta = "#c89dc1"
+brown = "#75452a"
+
+bright_red = "#faaaa9"
+bright_yellow = "#f7dc9c"
+bright_green = "#c4cfc4"
+bright_cyan = "#dfeaf0"
+bright_blue = "#c2c4f0"
+bright_magenta = "#ead7e7"
diff --git a/themes/everforest/backgrounds/1-tree-tops.webp b/themes/everforest/backgrounds/1-tree-tops.webp
new file mode 100644
index 0000000..04e48e8
Binary files /dev/null and b/themes/everforest/backgrounds/1-tree-tops.webp differ
diff --git a/themes/everforest/backgrounds/omarchy.webp b/themes/everforest/backgrounds/omarchy.webp
new file mode 100644
index 0000000..1917733
Binary files /dev/null and b/themes/everforest/backgrounds/omarchy.webp differ
diff --git a/themes/everforest/colors.toml b/themes/everforest/colors.toml
index 9aaeeb5..a277812 100644
--- a/themes/everforest/colors.toml
+++ b/themes/everforest/colors.toml
@@ -1,23 +1,31 @@
-accent = "#7fbbb3"
-cursor = "#d3c6aa"
-foreground = "#d3c6aa"
-background = "#2d353b"
-selection_foreground = "#2d353b"
-selection_background = "#d3c6aa"
+mode = "dark"
 
-color0 = "#475258"
-color1 = "#e67e80"
-color2 = "#a7c080"
-color3 = "#dbbc7f"
-color4 = "#7fbbb3"
-color5 = "#d699b6"
-color6 = "#83c092"
-color7 = "#d3c6aa"
-color8 = "#475258"
-color9 = "#e67e80"
-color10 = "#a7c080"
-color11 = "#dbbc7f"
-color12 = "#7fbbb3"
-color13 = "#d699b6"
-color14 = "#83c092"
-color15 = "#d3c6aa"
+accent = "#7fbbb3"
+selection = "#3d484d"
+muted = "#475258"
+
+background = "#2d353b"
+dark_background = "#21272c"
+darker_background = "#181d20"
+lighter_background = "#343f44"
+
+foreground = "#d3c6aa"
+dark_foreground = "#4f585e"
+light_foreground = "#9da9a0"
+bright_foreground = "#d3c6aa"
+
+red = "#e67e80"
+yellow = "#dbbc7f"
+orange = "#e09d7f"
+green = "#a7c080"
+cyan = "#83c092"
+blue = "#7fbbb3"
+magenta = "#d699b6"
+brown = "#704e3f"
+
+bright_red = "#e67e80"
+bright_yellow = "#dbbc7f"
+bright_green = "#a7c080"
+bright_cyan = "#83c092"
+bright_blue = "#7fbbb3"
+bright_magenta = "#d699b6"
diff --git a/themes/flexoki-light/backgrounds/1-orb.webp b/themes/flexoki-light/backgrounds/1-orb.webp
new file mode 100644
index 0000000..6de1da8
Binary files /dev/null and b/themes/flexoki-light/backgrounds/1-orb.webp differ
diff --git a/themes/flexoki-light/backgrounds/2-omarchy.webp b/themes/flexoki-light/backgrounds/2-omarchy.webp
new file mode 100644
index 0000000..f2aaf8e
Binary files /dev/null and b/themes/flexoki-light/backgrounds/2-omarchy.webp differ
diff --git a/themes/flexoki-light/colors.toml b/themes/flexoki-light/colors.toml
index 1e3b886..30146f3 100644
--- a/themes/flexoki-light/colors.toml
+++ b/themes/flexoki-light/colors.toml
@@ -1,23 +1,31 @@
-accent = "#205EA6"
-cursor = "#100F0F"
-foreground = "#100F0F"
-background = "#FFFCF0"
-selection_foreground = "#100F0F"
-selection_background = "#CECDC3"
+mode = "light"
 
-color0 = "#DAD8CE"
-color1 = "#D14D41"
-color2 = "#879A39"
-color3 = "#D0A215"
-color4 = "#205EA6"
-color5 = "#CE5D97"
-color6 = "#3AA99F"
-color7 = "#B7B5AC"
-color8 = "#100F0F"
-color9 = "#D14D41"
-color10 = "#879A39"
-color11 = "#D0A215"
-color12 = "#4385BE"
-color13 = "#CE5D97"
-color14 = "#3AA99F"
-color15 = "#CECDC3"
+accent = "#205EA6"
+selection = "#CECDC3"
+muted = "#B7B5AC"
+
+background = "#FFFCF0"
+dark_background = "#f2efe4"
+darker_background = "#e5e2d8"
+lighter_background = "#E6E4D9"
+
+foreground = "#100F0F"
+dark_foreground = "#878580"
+light_foreground = "#403E3C"
+bright_foreground = "#100F0F"
+
+red = "#D14D41"
+yellow = "#D0A215"
+orange = "#d0772b"
+green = "#879A39"
+cyan = "#3AA99F"
+blue = "#205EA6"
+magenta = "#CE5D97"
+brown = "#683b15"
+
+bright_red = "#D14D41"
+bright_yellow = "#D0A215"
+bright_green = "#879A39"
+bright_cyan = "#3AA99F"
+bright_blue = "#4385BE"
+bright_magenta = "#CE5D97"
diff --git a/themes/gruvbox/backgrounds/2-flower-basket.webp b/themes/gruvbox/backgrounds/2-flower-basket.webp
new file mode 100644
index 0000000..c8648ef
Binary files /dev/null and b/themes/gruvbox/backgrounds/2-flower-basket.webp differ
diff --git a/themes/gruvbox/backgrounds/omarchy.webp b/themes/gruvbox/backgrounds/omarchy.webp
new file mode 100644
index 0000000..540b7d0
Binary files /dev/null and b/themes/gruvbox/backgrounds/omarchy.webp differ
diff --git a/themes/gruvbox/colors.toml b/themes/gruvbox/colors.toml
index 57847f0..0c8e74d 100644
--- a/themes/gruvbox/colors.toml
+++ b/themes/gruvbox/colors.toml
@@ -1,23 +1,31 @@
-accent = "#7daea3"
-cursor = "#bdae93"
-foreground = "#d4be98"
-background = "#282828"
-selection_foreground = "#ebdbb2"
-selection_background = "#d65d0e"
+mode = "dark"
 
-color0 = "#3c3836"
-color1 = "#ea6962"
-color2 = "#a9b665"
-color3 = "#d8a657"
-color4 = "#7daea3"
-color5 = "#d3869b"
-color6 = "#89b482"
-color7 = "#d4be98"
-color8 = "#3c3836"
-color9 = "#ea6962"
-color10 = "#a9b665"
-color11 = "#d8a657"
-color12 = "#7daea3"
-color13 = "#d3869b"
-color14 = "#89b482"
-color15 = "#d4be98"
+accent = "#7daea3"
+selection = "#504945"
+muted = "#665c54"
+
+background = "#282828"
+dark_background = "#1e1e1e"
+darker_background = "#161616"
+lighter_background = "#3c3836"
+
+foreground = "#d4be98"
+dark_foreground = "#7c6f64"
+light_foreground = "#bdae93"
+bright_foreground = "#d4be98"
+
+red = "#ea6962"
+yellow = "#d8a657"
+orange = "#e1875c"
+green = "#a9b665"
+cyan = "#89b482"
+blue = "#7daea3"
+magenta = "#d3869b"
+brown = "#70432e"
+
+bright_red = "#ea6962"
+bright_yellow = "#d8a657"
+bright_green = "#a9b665"
+bright_cyan = "#89b482"
+bright_blue = "#7daea3"
+bright_magenta = "#d3869b"
diff --git a/themes/hackerman/backgrounds/2-geometric.webp b/themes/hackerman/backgrounds/2-geometric.webp
new file mode 100644
index 0000000..c1ca030
Binary files /dev/null and b/themes/hackerman/backgrounds/2-geometric.webp differ
diff --git a/themes/hackerman/backgrounds/omarchy.webp b/themes/hackerman/backgrounds/omarchy.webp
new file mode 100644
index 0000000..77f3554
Binary files /dev/null and b/themes/hackerman/backgrounds/omarchy.webp differ
diff --git a/themes/hackerman/colors.toml b/themes/hackerman/colors.toml
index 517ff36..d351c8d 100644
--- a/themes/hackerman/colors.toml
+++ b/themes/hackerman/colors.toml
@@ -1,23 +1,33 @@
-accent = "#82FB9C"
-cursor = "#ddf7ff"
-foreground = "#ddf7ff"
-background = "#0B0C16"
-selection_foreground = "#0B0C16"
-selection_background = "#ddf7ff"
+mode = "dark"
 
-color0 = "#3E4058"
-color1 = "#50f872"
-color2 = "#4fe88f"
-color3 = "#50f7d4"
-color4 = "#829dd4"
-color5 = "#86a7df"
-color6 = "#7cf8f7"
-color7 = "#85E1FB"
-color8 = "#6a6e95"
-color9 = "#85ff9d"
-color10 = "#9cf7c2"
-color11 = "#a4ffec"
-color12 = "#c4d2ed"
-color13 = "#cddbf4"
-color14 = "#d1fffe"
-color15 = "#ddf7ff"
+accent = "#82FB9C"
+selection = "#1f253a"
+muted = "#2d3450"
+
+background = "#0B0C16"
+dark_background = "#080910"
+darker_background = "#06060c"
+lighter_background = "#151828"
+
+foreground = "#ddf7ff"
+dark_foreground = "#6a6e95"
+light_foreground = "#b5c5db"
+bright_foreground = "#ddf7ff"
+
+hyprland_active_border = "rgba(26a269ee) rgba(2ec27eee) 45deg"
+
+red = "#50f872"
+yellow = "#50f7d4"
+orange = "#50f7a3"
+green = "#4fe88f"
+cyan = "#7cf8f7"
+blue = "#829dd4"
+magenta = "#86a7df"
+brown = "#287b51"
+
+bright_red = "#85ff9d"
+bright_yellow = "#a4ffec"
+bright_green = "#9cf7c2"
+bright_cyan = "#d1fffe"
+bright_blue = "#c4d2ed"
+bright_magenta = "#cddbf4"
diff --git a/themes/kanagawa/backgrounds/omarchy.webp b/themes/kanagawa/backgrounds/omarchy.webp
new file mode 100644
index 0000000..f2d49ee
Binary files /dev/null and b/themes/kanagawa/backgrounds/omarchy.webp differ
diff --git a/themes/kanagawa/colors.toml b/themes/kanagawa/colors.toml
index 7ca002e..e897511 100644
--- a/themes/kanagawa/colors.toml
+++ b/themes/kanagawa/colors.toml
@@ -1,23 +1,31 @@
-accent = "#7e9cd8"
-cursor = "#c8c093"
-foreground = "#dcd7ba"
-background = "#1f1f28"
-selection_foreground = "#c8c093"
-selection_background = "#2d4f67"
+mode = "dark"
 
-color0 = "#090618"
-color1 = "#c34043"
-color2 = "#76946a"
-color3 = "#c0a36e"
-color4 = "#7e9cd8"
-color5 = "#957fb8"
-color6 = "#6a9589"
-color7 = "#c8c093"
-color8 = "#727169"
-color9 = "#e82424"
-color10 = "#98bb6c"
-color11 = "#e6c384"
-color12 = "#7fb4ca"
-color13 = "#938aa9"
-color14 = "#7aa89f"
-color15 = "#dcd7ba"
+accent = "#dcd7ba"
+selection = "#363646"
+muted = "#54546D"
+
+background = "#1f1f28"
+dark_background = "#17171e"
+darker_background = "#111116"
+lighter_background = "#223249"
+
+foreground = "#dcd7ba"
+dark_foreground = "#727169"
+light_foreground = "#c8c093"
+bright_foreground = "#dcd7ba"
+
+red = "#c34043"
+yellow = "#c0a36e"
+orange = "#c17158"
+green = "#76946a"
+cyan = "#6a9589"
+blue = "#7e9cd8"
+magenta = "#957fb8"
+brown = "#60382c"
+
+bright_red = "#e82424"
+bright_yellow = "#e6c384"
+bright_green = "#98bb6c"
+bright_cyan = "#7aa89f"
+bright_blue = "#7fb4ca"
+bright_magenta = "#938aa9"
diff --git a/themes/kanagawa/hyprland.lua b/themes/kanagawa/hyprland.lua
new file mode 100644
index 0000000..d0f190f
--- /dev/null
+++ b/themes/kanagawa/hyprland.lua
@@ -0,0 +1,18 @@
+local active_border_color = "rgb(dcd7ba)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+    },
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+    },
+  },
+})
+
+-- Kanagawa backdrop is too strong for default opacity.
+o.window({ tag = "terminal" }, { opacity = "0.99 0.985" })
diff --git a/themes/last-horizon/backgrounds/1-eyes-wide.webp b/themes/last-horizon/backgrounds/1-eyes-wide.webp
new file mode 100644
index 0000000..c10c9f4
Binary files /dev/null and b/themes/last-horizon/backgrounds/1-eyes-wide.webp differ
diff --git a/themes/last-horizon/backgrounds/2-blink.webp b/themes/last-horizon/backgrounds/2-blink.webp
new file mode 100644
index 0000000..f2cd8cc
Binary files /dev/null and b/themes/last-horizon/backgrounds/2-blink.webp differ
diff --git a/themes/last-horizon/backgrounds/3-bokeh.webp b/themes/last-horizon/backgrounds/3-bokeh.webp
new file mode 100644
index 0000000..96ca898
Binary files /dev/null and b/themes/last-horizon/backgrounds/3-bokeh.webp differ
diff --git a/themes/last-horizon/backgrounds/4-new-horizons.jpg b/themes/last-horizon/backgrounds/4-new-horizons.jpg
new file mode 100644
index 0000000..f3dca1e
Binary files /dev/null and b/themes/last-horizon/backgrounds/4-new-horizons.jpg differ
diff --git a/themes/last-horizon/btop.theme b/themes/last-horizon/btop.theme
new file mode 100644
index 0000000..8ee3766
--- /dev/null
+++ b/themes/last-horizon/btop.theme
@@ -0,0 +1,93 @@
+# Main background
+theme[main_bg]="#0c0b0c"
+
+# Main text color
+theme[main_fg]="#e2dddc"
+
+# Title color for boxes
+theme[title]="#b59790"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#c4d8e2"
+
+# Background color of selected item in processes box
+theme[selected_bg]="#e2dddc"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#0c0b0c"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#584e51"
+
+# Color of text appearing on top of graphs
+theme[graph_text]="#e2dddc"
+
+# Background color of the percentage meters
+theme[meter_bg]="#1e1d1e"
+
+# Misc colors for processes box
+theme[proc_misc]="#e2dddc"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="#584e51"
+theme[mem_box]="#584e51"
+theme[net_box]="#584e51"
+theme[proc_box]="#584e51"
+
+# Box divider line and small boxes line color
+theme[div_line]="#6B5E73"
+
+# Temperature graph color (Green -> Yellow -> Red)
+theme[temp_start]="#87a9b0"
+theme[temp_mid]="#6B5E73"
+theme[temp_end]="#c38b7b"
+
+# CPU graph colors (Blue -> Cyan -> Magenta)
+theme[cpu_start]="#b59790"
+theme[cpu_mid]="#a5a0b6"
+theme[cpu_end]="#c4d8e2"
+
+# Mem/Disk free meter (Reversed "Available" colors: Cyan -> Blue -> Purple)
+theme[free_start]="#c4d8e2"
+theme[free_mid]="#b59790"
+theme[free_end]="#6B5E73"
+
+# Mem/Disk cached meter
+theme[cached_start]="#b59790"
+theme[cached_mid]="#c4d8e2"
+theme[cached_end]="#e2dddc"
+
+# Mem/Disk available meter (Purple -> Blue -> Cyan)
+theme[available_start]="#6B5E73"
+theme[available_mid]="#b59790"
+theme[available_end]="#a5a0b6"
+
+# Mem/Disk used meter
+theme[used_start]="#c38b7b"
+theme[used_mid]="#6B5E73"
+theme[used_end]="#584e51"
+
+# Download graph colors
+theme[download_start]="#87a9b0"
+theme[download_mid]="#a5a0b6"
+theme[download_end]="#cfd3cd"
+
+# Upload graph colors
+theme[upload_start]="#b59790"
+theme[upload_mid]="#c4d8e2"
+theme[upload_end]="#e2dddc"
+
+# Process box color gradient
+theme[process_start]="#c4d8e2"
+theme[process_mid]="#a5a0b6"
+theme[process_end]="#c38b7b"
+
+# Graph gradient colors
+theme[gradient_color_0]="#0c0b0c"
+theme[gradient_color_1]="#584e51"
+theme[gradient_color_2]="#6B5E73"
+theme[gradient_color_3]="#c38b7b"
+theme[gradient_color_4]="#87a9b0"
+theme[gradient_color_5]="#b59790"
+theme[gradient_color_6]="#a5a0b6"
+theme[gradient_color_7]="#FAFCFB"
diff --git a/themes/last-horizon/chromium.theme b/themes/last-horizon/chromium.theme
new file mode 100644
index 0000000..717aa9e
--- /dev/null
+++ b/themes/last-horizon/chromium.theme
@@ -0,0 +1 @@
+12,11,12
diff --git a/themes/last-horizon/colors.toml b/themes/last-horizon/colors.toml
new file mode 100644
index 0000000..599ec80
--- /dev/null
+++ b/themes/last-horizon/colors.toml
@@ -0,0 +1,34 @@
+mode = "dark"
+
+accent = "#b59790"
+selection = "#584e51"
+muted = "#584e51"
+
+background = "#0c0b0c"
+dark_background = "#090809"
+darker_background = "#060606"
+lighter_background = "#0c0b0c"
+
+foreground = "#FAFCFB"
+dark_foreground = "#584e51"
+light_foreground = "#cfd3cd"
+bright_foreground = "#e2dddc"
+
+hyprland_active_border = "rgba(8a8588ee) rgba(e2dddcee)"
+hyprland_inactive_border = "rgba(584e51aa)"
+active_border_color = "#d6d3de"
+active_tab_background = "#a5a0b6"
+
+red = "#c38b7b"
+yellow = "#6B5E73"
+green = "#87a9b0"
+cyan = "#a5a0b6"
+blue = "#b59790"
+magenta = "#c4d8e2"
+
+bright_red = "#c38b7b"
+bright_yellow = "#6B5E73"
+bright_green = "#87a9b0"
+bright_cyan = "#a5a0b6"
+bright_blue = "#b59790"
+bright_magenta = "#c4d8e2"
diff --git a/themes/last-horizon/hyprland.lua b/themes/last-horizon/hyprland.lua
new file mode 100644
index 0000000..892f252
--- /dev/null
+++ b/themes/last-horizon/hyprland.lua
@@ -0,0 +1,17 @@
+local active_border_color = { colors = { "rgba(8a8588ee)", "rgba(e2dddcee)" }, angle = 45 }
+local inactive_border_color = "rgba(584e51aa)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
+    },
+  },
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+  },
+})
diff --git a/themes/last-horizon/icons.theme b/themes/last-horizon/icons.theme
new file mode 100644
index 0000000..24a4551
--- /dev/null
+++ b/themes/last-horizon/icons.theme
@@ -0,0 +1 @@
+Yaru-purple
diff --git a/themes/last-horizon/preview-unlock.png b/themes/last-horizon/preview-unlock.png
new file mode 100644
index 0000000..0acec8a
Binary files /dev/null and b/themes/last-horizon/preview-unlock.png differ
diff --git a/themes/last-horizon/preview.png b/themes/last-horizon/preview.png
new file mode 100644
index 0000000..cffffd5
Binary files /dev/null and b/themes/last-horizon/preview.png differ
diff --git a/themes/last-horizon/unlock.png b/themes/last-horizon/unlock.png
new file mode 100644
index 0000000..56853ba
Binary files /dev/null and b/themes/last-horizon/unlock.png differ
diff --git a/themes/last-horizon/vscode.json b/themes/last-horizon/vscode.json
new file mode 100644
index 0000000..9f38b21
--- /dev/null
+++ b/themes/last-horizon/vscode.json
@@ -0,0 +1,4 @@
+{
+  "name": "Ship at Sea",
+  "extension": "rikkarth.ship-at-sea"
+}
\ No newline at end of file
diff --git a/themes/lumon/backgrounds/01-united-in-severance.webp b/themes/lumon/backgrounds/01-united-in-severance.webp
new file mode 100644
index 0000000..03bf785
Binary files /dev/null and b/themes/lumon/backgrounds/01-united-in-severance.webp differ
diff --git a/themes/lumon/backgrounds/02-opinions-equally.webp b/themes/lumon/backgrounds/02-opinions-equally.webp
new file mode 100644
index 0000000..583cd27
Binary files /dev/null and b/themes/lumon/backgrounds/02-opinions-equally.webp differ
diff --git a/themes/lumon/backgrounds/omarchy.webp b/themes/lumon/backgrounds/omarchy.webp
new file mode 100644
index 0000000..d2f7f95
Binary files /dev/null and b/themes/lumon/backgrounds/omarchy.webp differ
diff --git a/themes/lumon/colors.toml b/themes/lumon/colors.toml
index 1ddfcb1..0493ffb 100644
--- a/themes/lumon/colors.toml
+++ b/themes/lumon/colors.toml
@@ -1,35 +1,34 @@
-# Accent and UI colors
+mode = "dark"
+
 accent = "#8bc9eb"
+selection = "#243d56"
+muted = "#304860"
+
+background = "#16242d"
+dark_background = "#101b21"
+darker_background = "#0b1216"
+lighter_background = "#1b2d40"
+
+foreground = "#d6e2ee"
+dark_foreground = "#4d86b0"
+light_foreground = "#d6e2ee"
+bright_foreground = "#f2fcff"
+
 active_border_color = "#f2fcff"
 active_tab_background = "#6fb8e3"
 
-# Cursor colors
-cursor = "#f2fcff"
+red = "#4d86b0"
+yellow = "#6fa4c9"
+orange = "#8bc9eb"
+green = "#5e95bc"
+cyan = "#b4e4f6"
+blue = "#6fb8e3"
+magenta = "#8bc9eb"
+brown = "#456475"
 
-# Primary colors
-foreground = "#d6e2ee"
-background = "#16242d"
-
-# Selection colors
-selection_foreground = "#1b2d40"
-selection_background = "#4d9ed3"
-
-# Normal colors (ANSI 0-7)
-color0  = "#1b2d40"
-color1  = "#4d86b0"
-color2  = "#5e95bc"
-color3  = "#6fa4c9"
-color4  = "#6fb8e3"
-color5  = "#8bc9eb"
-color6  = "#b4e4f6"
-color7  = "#d6e2ee"
-
-# Bright colors (ANSI 8-15)
-color8  = "#304860"
-color9  = "#73a6cb"
-color10 = "#86b7d8"
-color11 = "#9dcae5"
-color12 = "#f2fcff"
-color13 = "#b1d8ee"
-color14 = "#d1eef8"
-color15 = "#ffffff"
+bright_red = "#73a6cb"
+bright_yellow = "#9dcae5"
+bright_green = "#86b7d8"
+bright_cyan = "#d1eef8"
+bright_blue = "#f2fcff"
+bright_magenta = "#b1d8ee"
diff --git a/themes/lumon/hyprland.lua b/themes/lumon/hyprland.lua
new file mode 100644
index 0000000..e348a91
--- /dev/null
+++ b/themes/lumon/hyprland.lua
@@ -0,0 +1,30 @@
+local active_border_color = "rgb(f2fcff)"
+local active_shadow_color = "rgb(6fb8e3)"
+local inactive_border_color = "rgba(30486099)"
+local inactive_shadow_color = "rgba(30486077)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
+    }
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+  },
+
+  decoration = {
+    shadow = {
+      enabled = true,
+      range = 6,
+      render_power = 4,
+      color = active_shadow_color,
+      color_inactive = inactive_shadow_color,
+    },
+  },
+})
diff --git a/themes/lupine/backgrounds/01-cherry-blossom-bokeh.webp b/themes/lupine/backgrounds/01-cherry-blossom-bokeh.webp
new file mode 100644
index 0000000..fb0c108
Binary files /dev/null and b/themes/lupine/backgrounds/01-cherry-blossom-bokeh.webp differ
diff --git a/themes/lupine/backgrounds/02-cherry-blossom-white.webp b/themes/lupine/backgrounds/02-cherry-blossom-white.webp
new file mode 100644
index 0000000..a3c0c66
Binary files /dev/null and b/themes/lupine/backgrounds/02-cherry-blossom-white.webp differ
diff --git a/themes/lupine/backgrounds/03-pastel-clouds.webp b/themes/lupine/backgrounds/03-pastel-clouds.webp
new file mode 100644
index 0000000..ebf4580
Binary files /dev/null and b/themes/lupine/backgrounds/03-pastel-clouds.webp differ
diff --git a/themes/lupine/backgrounds/04-elegant-blue-wave.webp b/themes/lupine/backgrounds/04-elegant-blue-wave.webp
new file mode 100644
index 0000000..b2ea59b
Binary files /dev/null and b/themes/lupine/backgrounds/04-elegant-blue-wave.webp differ
diff --git a/themes/lupine/backgrounds/05-abstract-wave.webp b/themes/lupine/backgrounds/05-abstract-wave.webp
new file mode 100644
index 0000000..ae84bff
Binary files /dev/null and b/themes/lupine/backgrounds/05-abstract-wave.webp differ
diff --git a/themes/lupine/backgrounds/06-omarchy.webp b/themes/lupine/backgrounds/06-omarchy.webp
new file mode 100644
index 0000000..1602925
Binary files /dev/null and b/themes/lupine/backgrounds/06-omarchy.webp differ
diff --git a/themes/lupine/colors.toml b/themes/lupine/colors.toml
new file mode 100644
index 0000000..8d12987
--- /dev/null
+++ b/themes/lupine/colors.toml
@@ -0,0 +1,31 @@
+mode = "light"
+
+accent = "#3264eb"
+selection = "#d0d0d0"
+muted = "#9e9e9e"
+
+background = "#fafafa"
+dark_background = "#ececec"
+darker_background = "#dedede"
+lighter_background = "#f5f5f5"
+
+foreground = "#212121"
+dark_foreground = "#757575"
+light_foreground = "#424242"
+bright_foreground = "#000000"
+
+red = "#c900c4"
+yellow = "#026fde"
+orange = "#026fde"
+green = "#4a2fd0"
+cyan = "#0c67de"
+blue = "#3264eb"
+magenta = "#8a4ad7"
+brown = "#013a6f"
+
+bright_red = "#f930fb"
+bright_yellow = "#358fff"
+bright_green = "#9f85e0"
+bright_cyan = "#3986ff"
+bright_blue = "#5482ff"
+bright_magenta = "#b363ff"
diff --git a/themes/lupine/icons.theme b/themes/lupine/icons.theme
new file mode 100644
index 0000000..24e9162
--- /dev/null
+++ b/themes/lupine/icons.theme
@@ -0,0 +1 @@
+Yaru-purple
\ No newline at end of file
diff --git a/themes/lupine/preview-unlock.png b/themes/lupine/preview-unlock.png
new file mode 100644
index 0000000..558ffae
Binary files /dev/null and b/themes/lupine/preview-unlock.png differ
diff --git a/themes/lupine/preview.png b/themes/lupine/preview.png
new file mode 100644
index 0000000..9a4c52b
Binary files /dev/null and b/themes/lupine/preview.png differ
diff --git a/themes/lupine/unlock.png b/themes/lupine/unlock.png
new file mode 100644
index 0000000..bf2c961
Binary files /dev/null and b/themes/lupine/unlock.png differ
diff --git a/themes/matte-black/backgrounds/1-dark-waters.webp b/themes/matte-black/backgrounds/1-dark-waters.webp
new file mode 100644
index 0000000..9f381e7
Binary files /dev/null and b/themes/matte-black/backgrounds/1-dark-waters.webp differ
diff --git a/themes/matte-black/backgrounds/2-dot-hands.webp b/themes/matte-black/backgrounds/2-dot-hands.webp
new file mode 100644
index 0000000..1732696
Binary files /dev/null and b/themes/matte-black/backgrounds/2-dot-hands.webp differ
diff --git a/themes/matte-black/backgrounds/omarchy.webp b/themes/matte-black/backgrounds/omarchy.webp
new file mode 100644
index 0000000..c8cab9a
Binary files /dev/null and b/themes/matte-black/backgrounds/omarchy.webp differ
diff --git a/themes/matte-black/colors.toml b/themes/matte-black/colors.toml
index 5e1a8cc..4179f8a 100644
--- a/themes/matte-black/colors.toml
+++ b/themes/matte-black/colors.toml
@@ -1,23 +1,31 @@
-accent = "#e68e0d"
-cursor = "#eaeaea"
-foreground = "#bebebe"
-background = "#121212"
-selection_foreground = "#bebebe"
-selection_background = "#515151"
+mode = "dark"
 
-color0 = "#333333"
-color1 = "#D35F5F"
-color2 = "#FFC107"
-color3 = "#b91c1c"
-color4 = "#e68e0d"
-color5 = "#D35F5F"
-color6 = "#bebebe"
-color7 = "#bebebe"
-color8 = "#8a8a8d"
-color9 = "#B91C1C"
-color10 = "#FFC107"
-color11 = "#b90a0a"
-color12 = "#f59e0b"
-color13 = "#B91C1C"
-color14 = "#eaeaea"
-color15 = "#ffffff"
+accent = "#e68e0d"
+selection = "#2a2a2a"
+muted = "#333333"
+
+background = "#121212"
+dark_background = "#0d0d0d"
+darker_background = "#090909"
+lighter_background = "#1e1e1e"
+
+foreground = "#bebebe"
+dark_foreground = "#555555"
+light_foreground = "#8a8a8d"
+bright_foreground = "#bebebe"
+
+red = "#D35F5F"
+yellow = "#b91c1c"
+orange = "#c63d3d"
+green = "#FFC107"
+cyan = "#bebebe"
+blue = "#e68e0d"
+magenta = "#D35F5F"
+brown = "#631e1e"
+
+bright_red = "#B91C1C"
+bright_yellow = "#b90a0a"
+bright_green = "#FFC107"
+bright_cyan = "#eaeaea"
+bright_blue = "#f59e0b"
+bright_magenta = "#B91C1C"
diff --git a/themes/miasma/backgrounds/01-nature-of-fear.webp b/themes/miasma/backgrounds/01-nature-of-fear.webp
new file mode 100644
index 0000000..a2da4cb
Binary files /dev/null and b/themes/miasma/backgrounds/01-nature-of-fear.webp differ
diff --git a/themes/miasma/backgrounds/02-crowned.webp b/themes/miasma/backgrounds/02-crowned.webp
new file mode 100644
index 0000000..7d59677
Binary files /dev/null and b/themes/miasma/backgrounds/02-crowned.webp differ
diff --git a/themes/miasma/backgrounds/omarchy.webp b/themes/miasma/backgrounds/omarchy.webp
new file mode 100644
index 0000000..517ba22
Binary files /dev/null and b/themes/miasma/backgrounds/omarchy.webp differ
diff --git a/themes/miasma/colors.toml b/themes/miasma/colors.toml
index 705ce2e..72949b7 100644
--- a/themes/miasma/colors.toml
+++ b/themes/miasma/colors.toml
@@ -1,23 +1,31 @@
-accent = "#78824b"
-cursor = "#c7c7c7"
-foreground = "#c2c2b0"
-background = "#222222"
-selection_foreground = "#c2c2b0"
-selection_background = "#78824b"
+mode = "dark"
 
-color0 = "#000000"
-color1 = "#685742"
-color2 = "#5f875f"
-color3 = "#b36d43"
-color4 = "#78824b"
-color5 = "#bb7744"
-color6 = "#c9a554"
-color7 = "#d7c483"
-color8 = "#666666"
-color9 = "#685742"
-color10 = "#5f875f"
-color11 = "#b36d43"
-color12 = "#78824b"
-color13 = "#bb7744"
-color14 = "#c9a554"
-color15 = "#d7c483"
+accent = "#78824b"
+selection = "#383838"
+muted = "#666666"
+
+background = "#222222"
+dark_background = "#191919"
+darker_background = "#121212"
+lighter_background = "#2c2c2c"
+
+foreground = "#c2c2b0"
+dark_foreground = "#555555"
+light_foreground = "#8a8a7e"
+bright_foreground = "#c2c2b0"
+
+red = "#685742"
+yellow = "#b36d43"
+orange = "#8d6242"
+green = "#5f875f"
+cyan = "#c9a554"
+blue = "#78824b"
+magenta = "#bb7744"
+brown = "#463121"
+
+bright_red = "#685742"
+bright_yellow = "#b36d43"
+bright_green = "#5f875f"
+bright_cyan = "#c9a554"
+bright_blue = "#78824b"
+bright_magenta = "#bb7744"
diff --git a/themes/nord/backgrounds/1-city-view.webp b/themes/nord/backgrounds/1-city-view.webp
new file mode 100644
index 0000000..0dbc4b9
Binary files /dev/null and b/themes/nord/backgrounds/1-city-view.webp differ
diff --git a/themes/nord/backgrounds/2-night-hawks.webp b/themes/nord/backgrounds/2-night-hawks.webp
new file mode 100644
index 0000000..f8bbcb4
Binary files /dev/null and b/themes/nord/backgrounds/2-night-hawks.webp differ
diff --git a/themes/nord/backgrounds/omarchy.webp b/themes/nord/backgrounds/omarchy.webp
new file mode 100644
index 0000000..1bd6d53
Binary files /dev/null and b/themes/nord/backgrounds/omarchy.webp differ
diff --git a/themes/nord/colors.toml b/themes/nord/colors.toml
index 79c2ae2..76de155 100644
--- a/themes/nord/colors.toml
+++ b/themes/nord/colors.toml
@@ -1,23 +1,31 @@
-accent = "#81a1c1"
-cursor = "#d8dee9"
-foreground = "#d8dee9"
-background = "#2e3440"
-selection_foreground = "#d8dee9"
-selection_background = "#4c566a"
+mode = "dark"
 
-color0 = "#3b4252"
-color1 = "#bf616a"
-color2 = "#a3be8c"
-color3 = "#ebcb8b"
-color4 = "#81a1c1"
-color5 = "#b48ead"
-color6 = "#88c0d0"
-color7 = "#e5e9f0"
-color8 = "#4c566a"
-color9 = "#bf616a"
-color10 = "#a3be8c"
-color11 = "#ebcb8b"
-color12 = "#81a1c1"
-color13 = "#b48ead"
-color14 = "#8fbcbb"
-color15 = "#eceff4"
+accent = "#81a1c1"
+selection = "#434c5e"
+muted = "#4c566a"
+
+background = "#2e3440"
+dark_background = "#222730"
+darker_background = "#191c23"
+lighter_background = "#3b4252"
+
+foreground = "#d8dee9"
+dark_foreground = "#667080"
+light_foreground = "#adb5c4"
+bright_foreground = "#d8dee9"
+
+red = "#bf616a"
+yellow = "#ebcb8b"
+orange = "#d5967a"
+green = "#a3be8c"
+cyan = "#88c0d0"
+blue = "#81a1c1"
+magenta = "#b48ead"
+brown = "#6a4b3d"
+
+bright_red = "#bf616a"
+bright_yellow = "#ebcb8b"
+bright_green = "#a3be8c"
+bright_cyan = "#8fbcbb"
+bright_blue = "#81a1c1"
+bright_magenta = "#b48ead"
diff --git a/themes/osaka-jade/backgrounds/1-glowing-city.webp b/themes/osaka-jade/backgrounds/1-glowing-city.webp
new file mode 100644
index 0000000..1192298
Binary files /dev/null and b/themes/osaka-jade/backgrounds/1-glowing-city.webp differ
diff --git a/themes/osaka-jade/backgrounds/2-shaded-entrance.webp b/themes/osaka-jade/backgrounds/2-shaded-entrance.webp
new file mode 100644
index 0000000..f7ce001
Binary files /dev/null and b/themes/osaka-jade/backgrounds/2-shaded-entrance.webp differ
diff --git a/themes/osaka-jade/backgrounds/3-mountain-moon.webp b/themes/osaka-jade/backgrounds/3-mountain-moon.webp
new file mode 100644
index 0000000..65490f2
Binary files /dev/null and b/themes/osaka-jade/backgrounds/3-mountain-moon.webp differ
diff --git a/themes/osaka-jade/backgrounds/omarchy.webp b/themes/osaka-jade/backgrounds/omarchy.webp
new file mode 100644
index 0000000..7192ffc
Binary files /dev/null and b/themes/osaka-jade/backgrounds/omarchy.webp differ
diff --git a/themes/osaka-jade/colors.toml b/themes/osaka-jade/colors.toml
index 76f763e..65cd8b4 100644
--- a/themes/osaka-jade/colors.toml
+++ b/themes/osaka-jade/colors.toml
@@ -1,23 +1,31 @@
-accent = "#509475"
-cursor = "#D7C995"
-foreground = "#C1C497"
-background = "#111c18"
-selection_foreground = "#111C18"
-selection_background = "#C1C497"
+mode = "dark"
 
-color0 = "#23372B"
-color1 = "#FF5345"
-color2 = "#549e6a"
-color3 = "#459451"
-color4 = "#509475"
-color5 = "#D2689C"
-color6 = "#2DD5B7"
-color7 = "#F6F5DD"
-color8 = "#53685B"
-color9 = "#db9f9c"
-color10 = "#63b07a"
-color11 = "#E5C736"
-color12 = "#ACD4CF"
-color13 = "#75bbb3"
-color14 = "#8CD3CB"
-color15 = "#9eebb3"
+accent = "#509475"
+selection = "#32473B"
+muted = "#53685B"
+
+background = "#111c18"
+dark_background = "#0c1512"
+darker_background = "#090f0d"
+lighter_background = "#23372B"
+
+foreground = "#C1C497"
+dark_foreground = "#81B8A8"
+light_foreground = "#D6D5BC"
+bright_foreground = "#F7E8B2"
+
+red = "#FF5345"
+yellow = "#459451"
+orange = "#a2734b"
+green = "#549e6a"
+cyan = "#2DD5B7"
+blue = "#509475"
+magenta = "#D2689C"
+brown = "#513925"
+
+bright_red = "#db9f9c"
+bright_yellow = "#E5C736"
+bright_green = "#63b07a"
+bright_cyan = "#8CD3CB"
+bright_blue = "#ACD4CF"
+bright_magenta = "#75bbb3"
diff --git a/themes/retro-82/backgrounds/1-in-the-groove.webp b/themes/retro-82/backgrounds/1-in-the-groove.webp
new file mode 100644
index 0000000..fb9802c
Binary files /dev/null and b/themes/retro-82/backgrounds/1-in-the-groove.webp differ
diff --git a/themes/retro-82/backgrounds/2-dusk-guardian.webp b/themes/retro-82/backgrounds/2-dusk-guardian.webp
new file mode 100644
index 0000000..b505cc6
Binary files /dev/null and b/themes/retro-82/backgrounds/2-dusk-guardian.webp differ
diff --git a/themes/retro-82/backgrounds/3-glassy-lines.webp b/themes/retro-82/backgrounds/3-glassy-lines.webp
new file mode 100644
index 0000000..9084273
Binary files /dev/null and b/themes/retro-82/backgrounds/3-glassy-lines.webp differ
diff --git a/themes/retro-82/backgrounds/4-gateway.webp b/themes/retro-82/backgrounds/4-gateway.webp
new file mode 100644
index 0000000..a02ff0e
Binary files /dev/null and b/themes/retro-82/backgrounds/4-gateway.webp differ
diff --git a/themes/retro-82/backgrounds/5-zen-boat.webp b/themes/retro-82/backgrounds/5-zen-boat.webp
new file mode 100644
index 0000000..0c79b19
Binary files /dev/null and b/themes/retro-82/backgrounds/5-zen-boat.webp differ
diff --git a/themes/retro-82/backgrounds/6-abstract-pyramids.webp b/themes/retro-82/backgrounds/6-abstract-pyramids.webp
new file mode 100644
index 0000000..d961a5d
Binary files /dev/null and b/themes/retro-82/backgrounds/6-abstract-pyramids.webp differ
diff --git a/themes/retro-82/backgrounds/7-the-journey.webp b/themes/retro-82/backgrounds/7-the-journey.webp
new file mode 100644
index 0000000..4d56aec
Binary files /dev/null and b/themes/retro-82/backgrounds/7-the-journey.webp differ
diff --git a/themes/retro-82/backgrounds/8-glitter-glass.webp b/themes/retro-82/backgrounds/8-glitter-glass.webp
new file mode 100644
index 0000000..7cb9e9b
Binary files /dev/null and b/themes/retro-82/backgrounds/8-glitter-glass.webp differ
diff --git a/themes/retro-82/backgrounds/omarchy.webp b/themes/retro-82/backgrounds/omarchy.webp
new file mode 100644
index 0000000..b42ee9b
Binary files /dev/null and b/themes/retro-82/backgrounds/omarchy.webp differ
diff --git a/themes/retro-82/colors.toml b/themes/retro-82/colors.toml
index 1b5285d..0a638ed 100644
--- a/themes/retro-82/colors.toml
+++ b/themes/retro-82/colors.toml
@@ -1,35 +1,31 @@
-# Accent and UI colors
+mode = "dark"
+
 accent = "#faa968"
-active_border_color = "#faa968"
-active_tab_background = "#faa968"
+selection = "#134e5a"
+muted = "#2a6b78"
 
-# Cursor colors
-cursor = "#f6dcac"
-
-# Primary colors
-foreground = "#f6dcac"
 background = "#05182e"
+dark_background = "#031222"
+darker_background = "#020c17"
+lighter_background = "#0a2540"
 
-# Selection colors
-selection_foreground = "#00172e"
-selection_background = "#faa968"
+foreground = "#f6dcac"
+dark_foreground = "#3f8f8a"
+light_foreground = "#a7c9c6"
+bright_foreground = "#f6dcac"
 
-# Normal colors (ANSI 0-7)
-color0 = "#303442"
-color1 = "#f85525"
-color2 = "#028391"
-color3 = "#e97b3c"
-color4 = "#faa968"
-color5 = "#3f8f8a"
-color6 = "#8cbfb8"
-color7 = "#a7c9c6"
+red = "#f85525"
+yellow = "#e97b3c"
+orange = "#faa968"
+green = "#028391"
+cyan = "#8cbfb8"
+blue = "#3f8f8a"
+magenta = "#3f8f8a"
+brown = "#743d1e"
 
-# Bright colors (ANSI 8-15)
-color8 = "#134e5a"
-color9 = "#f85525"
-color10 = "#028391"
-color11 = "#e97b3c"
-color12 = "#faa968"
-color13 = "#3f8f8a"
-color14 = "#8cbfb8"
-color15 = "#f6dcac"
+bright_red = "#f85525"
+bright_yellow = "#e97b3c"
+bright_green = "#028391"
+bright_cyan = "#8cbfb8"
+bright_blue = "#faa968"
+bright_magenta = "#3f8f8a"
diff --git a/themes/retro-82/hyprland.lua b/themes/retro-82/hyprland.lua
new file mode 100644
index 0000000..ebea23d
--- /dev/null
+++ b/themes/retro-82/hyprland.lua
@@ -0,0 +1,15 @@
+local active_border_color = "rgb(faa968)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+    },
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+    },
+  },
+})
diff --git a/themes/ristretto/backgrounds/0-launch.webp b/themes/ristretto/backgrounds/0-launch.webp
new file mode 100644
index 0000000..f393094
Binary files /dev/null and b/themes/ristretto/backgrounds/0-launch.webp differ
diff --git a/themes/ristretto/backgrounds/1-color-curves.webp b/themes/ristretto/backgrounds/1-color-curves.webp
new file mode 100644
index 0000000..ed4920e
Binary files /dev/null and b/themes/ristretto/backgrounds/1-color-curves.webp differ
diff --git a/themes/ristretto/backgrounds/2-coffee-beans.jpg b/themes/ristretto/backgrounds/2-coffee-beans.jpg
index faf63ea..3a879bf 100644
Binary files a/themes/ristretto/backgrounds/2-coffee-beans.jpg and b/themes/ristretto/backgrounds/2-coffee-beans.jpg differ
diff --git a/themes/ristretto/backgrounds/3-industrial-moon.webp b/themes/ristretto/backgrounds/3-industrial-moon.webp
new file mode 100644
index 0000000..f668555
Binary files /dev/null and b/themes/ristretto/backgrounds/3-industrial-moon.webp differ
diff --git a/themes/ristretto/backgrounds/omarchy.webp b/themes/ristretto/backgrounds/omarchy.webp
new file mode 100644
index 0000000..1364f53
Binary files /dev/null and b/themes/ristretto/backgrounds/omarchy.webp differ
diff --git a/themes/ristretto/colors.toml b/themes/ristretto/colors.toml
index b5ca9ab..0372dec 100644
--- a/themes/ristretto/colors.toml
+++ b/themes/ristretto/colors.toml
@@ -1,23 +1,31 @@
-accent = "#f38d70"
-cursor = "#c3b7b8"
-foreground = "#e6d9db"
-background = "#2c2525"
-selection_foreground = "#e6d9db"
-selection_background = "#403e41"
+mode = "dark"
 
-color0 = "#72696a"
-color1 = "#fd6883"
-color2 = "#adda78"
-color3 = "#f9cc6c"
-color4 = "#f38d70"
-color5 = "#a8a9eb"
-color6 = "#85dacc"
-color7 = "#e6d9db"
-color8 = "#948a8b"
-color9 = "#ff8297"
-color10 = "#c8e292"
-color11 = "#fcd675"
-color12 = "#f8a788"
-color13 = "#bebffd"
-color14 = "#9bf1e1"
-color15 = "#f1e5e7"
+accent = "#f38d70"
+selection = "#403e41"
+muted = "#72696a"
+
+background = "#2c2525"
+dark_background = "#211b1b"
+darker_background = "#181414"
+lighter_background = "#3d2f2a"
+
+foreground = "#e6d9db"
+dark_foreground = "#72696a"
+light_foreground = "#c3b7b8"
+bright_foreground = "#e6d9db"
+
+red = "#fd6883"
+yellow = "#f9cc6c"
+orange = "#fb9a77"
+green = "#adda78"
+cyan = "#85dacc"
+blue = "#f38d70"
+magenta = "#a8a9eb"
+brown = "#7d4d3b"
+
+bright_red = "#ff8297"
+bright_yellow = "#fcd675"
+bright_green = "#c8e292"
+bright_cyan = "#9bf1e1"
+bright_blue = "#f8a788"
+bright_magenta = "#bebffd"
diff --git a/themes/rose-pine/backgrounds/1-funky-shapes.webp b/themes/rose-pine/backgrounds/1-funky-shapes.webp
new file mode 100644
index 0000000..3b6f58c
Binary files /dev/null and b/themes/rose-pine/backgrounds/1-funky-shapes.webp differ
diff --git a/themes/rose-pine/backgrounds/2-dot-map.webp b/themes/rose-pine/backgrounds/2-dot-map.webp
new file mode 100644
index 0000000..eec20e1
Binary files /dev/null and b/themes/rose-pine/backgrounds/2-dot-map.webp differ
diff --git a/themes/rose-pine/backgrounds/3-omarchy-plants.webp b/themes/rose-pine/backgrounds/3-omarchy-plants.webp
new file mode 100644
index 0000000..91c0142
Binary files /dev/null and b/themes/rose-pine/backgrounds/3-omarchy-plants.webp differ
diff --git a/themes/rose-pine/backgrounds/omarchy.webp b/themes/rose-pine/backgrounds/omarchy.webp
new file mode 100644
index 0000000..0cab6b4
Binary files /dev/null and b/themes/rose-pine/backgrounds/omarchy.webp differ
diff --git a/themes/rose-pine/colors.toml b/themes/rose-pine/colors.toml
index e757ad0..404ff93 100644
--- a/themes/rose-pine/colors.toml
+++ b/themes/rose-pine/colors.toml
@@ -1,23 +1,31 @@
-accent = "#56949f"
-cursor = "#cecacd"
-foreground = "#575279"
-background = "#faf4ed"
-selection_foreground = "#575279"
-selection_background = "#dfdad9"
+mode = "light"
 
-color0 = "#f2e9e1"
-color1 = "#b4637a"
-color2 = "#286983"
-color3 = "#ea9d34"
-color4 = "#56949f"
-color5 = "#907aa9"
-color6 = "#d7827e"
-color7 = "#575279"
-color8 = "#9893a5"
-color9 = "#b4637a"
-color10 = "#286983"
-color11 = "#ea9d34"
-color12 = "#56949f"
-color13 = "#907aa9"
-color14 = "#d7827e"
-color15 = "#575279"
+accent = "#56949f"
+selection = "#dfdad9"
+muted = "#cecacd"
+
+background = "#faf4ed"
+dark_background = "#ede7e1"
+darker_background = "#e1dbd5"
+lighter_background = "#f2e9e1"
+
+foreground = "#575279"
+dark_foreground = "#9893a5"
+light_foreground = "#6e6a86"
+bright_foreground = "#575279"
+
+red = "#b4637a"
+yellow = "#ea9d34"
+orange = "#cf8057"
+green = "#286983"
+cyan = "#d7827e"
+blue = "#56949f"
+magenta = "#907aa9"
+brown = "#67402b"
+
+bright_red = "#b4637a"
+bright_yellow = "#ea9d34"
+bright_green = "#286983"
+bright_cyan = "#d7827e"
+bright_blue = "#56949f"
+bright_magenta = "#907aa9"
diff --git a/themes/solitude/backgrounds/1-on-pole.webp b/themes/solitude/backgrounds/1-on-pole.webp
new file mode 100644
index 0000000..6c9b09d
Binary files /dev/null and b/themes/solitude/backgrounds/1-on-pole.webp differ
diff --git a/themes/solitude/backgrounds/2-wreakage.webp b/themes/solitude/backgrounds/2-wreakage.webp
new file mode 100644
index 0000000..a64cc29
Binary files /dev/null and b/themes/solitude/backgrounds/2-wreakage.webp differ
diff --git a/themes/solitude/backgrounds/3-climb.jpg b/themes/solitude/backgrounds/3-climb.jpg
new file mode 100644
index 0000000..678e4e6
Binary files /dev/null and b/themes/solitude/backgrounds/3-climb.jpg differ
diff --git a/themes/solitude/backgrounds/4-ether.webp b/themes/solitude/backgrounds/4-ether.webp
new file mode 100644
index 0000000..4cfc3b2
Binary files /dev/null and b/themes/solitude/backgrounds/4-ether.webp differ
diff --git a/themes/solitude/backgrounds/5-eyed.jpg b/themes/solitude/backgrounds/5-eyed.jpg
new file mode 100644
index 0000000..b8bd7be
Binary files /dev/null and b/themes/solitude/backgrounds/5-eyed.jpg differ
diff --git a/themes/solitude/btop.theme b/themes/solitude/btop.theme
new file mode 100644
index 0000000..d188e32
--- /dev/null
+++ b/themes/solitude/btop.theme
@@ -0,0 +1,93 @@
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#101315"
+
+# Main text color
+theme[main_fg]="#cacccc"
+
+# Title color for boxes
+theme[title]="#cacccc"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#565d60"
+
+# Background color of selected item in processes box
+theme[selected_bg]="#a3a6a7"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#101315"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#565d60"
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#cbc2be"
+
+# Background color of the percentage meters
+theme[meter_bg]="#343d41"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#a3a6a7"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="#343d41"
+theme[mem_box]="#343d41"
+theme[net_box]="#343d41"
+theme[proc_box]="#343d41"
+
+# Box divider line and small boxes line color
+theme[div_line]="#343d41"
+
+# Temperature graph color (Normal -> Warm -> Hot)
+theme[temp_start]="#d9dbdc"
+theme[temp_mid]="#9fa5a9"
+theme[temp_end]="#de6145"
+
+# CPU graph colors
+theme[cpu_start]="#d9dbdc"
+theme[cpu_mid]="#9fa5a9"
+theme[cpu_end]="#de6145"
+
+# Mem/Disk free meter
+theme[free_start]="#d9dbdc"
+theme[free_mid]="#9fa5a9"
+theme[free_end]="#de6145"
+
+# Mem/Disk cached meter
+theme[cached_start]="#d9dbdc"
+theme[cached_mid]="#a5aeb4"
+theme[cached_end]="#798186"
+
+# Mem/Disk available meter
+theme[available_start]="#d9dbdc"
+theme[available_mid]="#a5aeb4"
+theme[available_end]="#798186"
+
+# Mem/Disk used meter
+theme[used_start]="#d9dbdc"
+theme[used_mid]="#9fa5a9"
+theme[used_end]="#de6145"
+
+# Download graph colors
+theme[download_start]="#d9dbdc"
+theme[download_mid]="#9fa5a9"
+theme[download_end]="#de6145"
+
+# Upload graph colors
+theme[upload_start]="#d9dbdc"
+theme[upload_mid]="#9fa5a9"
+theme[upload_end]="#de6145"
+
+# Process box color gradient for threads, mem and cpu usage
+theme[process_start]="#d9dbdc"
+theme[process_mid]="#9fa5a9"
+theme[process_end]="#de6145"
+
+# Graph gradient colors
+theme[gradient_color_0]="#101315"
+theme[gradient_color_1]="#343d41"
+theme[gradient_color_2]="#4b4e55"
+theme[gradient_color_3]="#798186"
+theme[gradient_color_4]="#9fa5a9"
+theme[gradient_color_5]="#a5aeb4"
+theme[gradient_color_6]="#d9dbdc"
+theme[gradient_color_7]="#de6145"
diff --git a/themes/solitude/colors.toml b/themes/solitude/colors.toml
new file mode 100644
index 0000000..950dfe4
--- /dev/null
+++ b/themes/solitude/colors.toml
@@ -0,0 +1,34 @@
+mode = "dark"
+
+accent = "#798186"
+selection = "#343d41"
+muted = "#4b4e55"
+
+background = "#101315"
+dark_background = "#0c0e10"
+darker_background = "#080a0b"
+lighter_background = "#101315"
+
+foreground = "#cacccc"
+dark_foreground = "#4b4e55"
+light_foreground = "#cbc2be"
+bright_foreground = "#a5aeb4"
+
+hyprland_active_border = "rgba(798186ee) rgba(caccccee)"
+hyprland_inactive_border = "rgb(1e1e1e)"
+active_border_color = "#a8adb0"
+active_tab_background = "#798186"
+
+red = "#565d60"
+yellow = "#d9dbdc"
+green = "#9fa5a9"
+cyan = "#707070"
+blue = "#798186"
+magenta = "#aeaeae"
+
+bright_red = "#de6145"
+bright_yellow = "#c9c2b4"
+bright_green = "#343d41"
+bright_cyan = "#707070"
+bright_blue = "#5d6367"
+bright_magenta = "#9a9a9a"
diff --git a/themes/solitude/hyprland.lua b/themes/solitude/hyprland.lua
new file mode 100644
index 0000000..4f2b590
--- /dev/null
+++ b/themes/solitude/hyprland.lua
@@ -0,0 +1,21 @@
+local active_border_color = { colors = { "rgba(798186ee)", "rgba(caccccee)" }, angle = 45 }
+local inactive_border_color = "rgb(1e1e1e)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
+    },
+  },
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+  },
+  decoration = {
+    rounding = 6,
+    rounding_power = 3,
+  },
+})
diff --git a/themes/solitude/icons.theme b/themes/solitude/icons.theme
new file mode 100644
index 0000000..4c02d89
--- /dev/null
+++ b/themes/solitude/icons.theme
@@ -0,0 +1 @@
+Yaru-sage-dark
diff --git a/themes/solitude/neovim.lua b/themes/solitude/neovim.lua
new file mode 100644
index 0000000..7caccb4
--- /dev/null
+++ b/themes/solitude/neovim.lua
@@ -0,0 +1,9 @@
+return {
+  { "ficcdaf/ashen.nvim" },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "ashen",
+    },
+  }
+}
\ No newline at end of file
diff --git a/themes/solitude/preview-unlock.png b/themes/solitude/preview-unlock.png
new file mode 100644
index 0000000..3990aa4
Binary files /dev/null and b/themes/solitude/preview-unlock.png differ
diff --git a/themes/solitude/preview.png b/themes/solitude/preview.png
new file mode 100644
index 0000000..010c444
Binary files /dev/null and b/themes/solitude/preview.png differ
diff --git a/themes/solitude/unlock.png b/themes/solitude/unlock.png
new file mode 100644
index 0000000..13476d7
Binary files /dev/null and b/themes/solitude/unlock.png differ
diff --git a/themes/solitude/vscode.json b/themes/solitude/vscode.json
new file mode 100644
index 0000000..5fe6bd3
--- /dev/null
+++ b/themes/solitude/vscode.json
@@ -0,0 +1,4 @@
+{
+  "name": "Noctokai",
+  "extension": "farigab.noctokai-theme"
+}
diff --git a/themes/tidewater-dark/README.md b/themes/tidewater-dark/README.md
new file mode 100644
index 0000000..4ca5326
--- /dev/null
+++ b/themes/tidewater-dark/README.md
@@ -0,0 +1,29 @@
+<pre style="line-height: 1.0; font-family: monospace; letter-spacing: 0px;">
+     s       .       ..                                                      s                                  ..                                      ..
+    :8      @88>   dF                      x=~                              :8                                dF                                  < .z@8"`
+   .88       8P   '88bu.                  88x.   .e.   .e.                 .88                  .u    .      '88bu.                     .u    .    !@88E
+  :888ooo    .    '*88888bu        .u    '8888X.x888:.x888        u       :888ooo      .u     .d88B :@8c     '*88888bu         u      .d88B :@8c   '888E   u
+-*8888888  .@88u    ^"*8888N    ud8888.   `8888  888X '888k    us888u.  -*8888888   ud8888.  ="8888f8888r      ^"*8888N     us888u.  ="8888f8888r   888E u@8NL
+  8888    ''888E`  beWE "888L :888'8888.   X888  888X  888X .@88 "8888"   8888    :888'8888.   4888>'88"      beWE "888L .@88 "8888"   4888>'88"    888E`"88*"
+  8888      888E   888E  888E d888 '88 "   X888  888X  888X 9888  9888    8888    d888 '88 "   4888> '        888E  888E 9888  9888    4888> '      888E .dN.
+  8888      888E   888E  888E 8888.+"      X888  888X  888X 9888  9888    8888    8888.+"      4888>          888E  888E 9888  9888    4888>        888E~8888
+ .8888Lu=   888E   888E  888F 8888L       .X888  888X. 888~ 9888  9888   .8888Lu= 8888L       .d888L .+       888E  888F 9888  9888   .d888L .+     888E '888&
+ ^ 888*     888&  .888N..888  '8888c. .+  ` 88 ``"*888Y"    9888  9888   ^ 888*   '8888c. .+  ^"8888*"       .888N..888  9888  9888   ^"8888*"      888E  9888.
+   'Y"      R888"  `"888*""    "88888       `~     `"       "888*""888"    'Y"     "88888        "Y"          `"888*""   "888*""888"     "Y"      '"888*" 4888"
+             ""       ""         "YP'                        ^Y"   ^Y'               "YP'                        ""       ^Y"   ^Y'                  ""    ""
+
+
+
+</pre>
+
+---
+
+An Omarchy theme for your Arch Linux / Hyprland setup. Deep teal night water, coral light, and warm sand — the dark half of the Tidewater pair, tuned for a readable terminal and a full palette of terminal colours for TUIs.
+
+![Tidewater Dark Theme Screenshot](preview.png)
+
+## Installation
+
+To install this theme, simply use the `omarchy theme install` command: `omarchy theme install https://github.com/signaldirective/tidewater-dark`
+
+**Theme by [Signal Directive](https://ko-fi.com/signaldirective)**
diff --git a/themes/tidewater-dark/backgrounds/ashish-kumar-senapati-uqHSe-zZN4A-unsplash.jpg b/themes/tidewater-dark/backgrounds/ashish-kumar-senapati-uqHSe-zZN4A-unsplash.jpg
new file mode 100644
index 0000000..8e8df2c
Binary files /dev/null and b/themes/tidewater-dark/backgrounds/ashish-kumar-senapati-uqHSe-zZN4A-unsplash.jpg differ
diff --git a/themes/tidewater-dark/backgrounds/martin-martz-U3SJ5SMLOPE-unsplash.jpg b/themes/tidewater-dark/backgrounds/martin-martz-U3SJ5SMLOPE-unsplash.jpg
new file mode 100644
index 0000000..d2838f8
Binary files /dev/null and b/themes/tidewater-dark/backgrounds/martin-martz-U3SJ5SMLOPE-unsplash.jpg differ
diff --git a/themes/tidewater-dark/colors.toml b/themes/tidewater-dark/colors.toml
new file mode 100644
index 0000000..3fbb24a
--- /dev/null
+++ b/themes/tidewater-dark/colors.toml
@@ -0,0 +1,35 @@
+# Tidewater Dark
+# Deep-teal night palette: teal water, coral light, warm sand.
+# Companion to tidewater-light; same hues, mirrored lightness.
+
+mode = "dark"
+
+accent = "#5cc9c1"
+selection = "#26403e"
+muted = "#47605e"
+
+background = "#0e1a1a"
+dark_background = "#0a1414"
+darker_background = "#060e0e"
+lighter_background = "#1a2b2a"
+
+foreground = "#d3e3e0"
+dark_foreground = "#6d8784"
+light_foreground = "#a4bfbc"
+bright_foreground = "#eef7f5"
+
+red = "#e57f6d"
+yellow = "#e3c07b"
+orange = "#e0996a"
+green = "#8fcaa4"
+cyan = "#5cc9c1"
+blue = "#74a9cf"
+magenta = "#cf8fb0"
+brown = "#9c7358"
+
+bright_red = "#f0937f"
+bright_yellow = "#f0d093"
+bright_green = "#a6dcb8"
+bright_cyan = "#7ad9d1"
+bright_blue = "#8fbfe0"
+bright_magenta = "#e0a6c6"
diff --git a/themes/tidewater-dark/icons.theme b/themes/tidewater-dark/icons.theme
new file mode 100644
index 0000000..5bab945
--- /dev/null
+++ b/themes/tidewater-dark/icons.theme
@@ -0,0 +1 @@
+Yaru-prussiangreen
diff --git a/themes/tidewater-dark/preview.png b/themes/tidewater-dark/preview.png
new file mode 100644
index 0000000..38db089
Binary files /dev/null and b/themes/tidewater-dark/preview.png differ
diff --git a/themes/tidewater-light/README.md b/themes/tidewater-light/README.md
new file mode 100644
index 0000000..09c25d7
--- /dev/null
+++ b/themes/tidewater-light/README.md
@@ -0,0 +1,29 @@
+<pre style="line-height: 1.0; font-family: monospace; letter-spacing: 0px;">
+     s       .       ..                                                      s                                     ..    .                                 s
+    :8      @88>   dF                      x=~                              :8                               x .d88"    @88>                .uef^"        :8
+   .88       8P   '88bu.                  88x.   .e.   .e.                 .88                  .u    .       5888R      8P               :d88E          .88
+  :888ooo    .    '*88888bu        .u    '8888X.x888:.x888        u       :888ooo      .u     .d88B :@8c      '888R      .         uL     `888E         :888ooo
+-*8888888  .@88u    ^"*8888N    ud8888.   `8888  888X '888k    us888u.  -*8888888   ud8888.  ="8888f8888r      888R    .@88u   .ue888Nc..  888E .z8k  -*8888888
+  8888    ''888E`  beWE "888L :888'8888.   X888  888X  888X .@88 "8888"   8888    :888'8888.   4888>'88"       888R   ''888E` d88E`"888E`  888E~?888L   8888
+  8888      888E   888E  888E d888 '88 "   X888  888X  888X 9888  9888    8888    d888 '88 "   4888> '         888R     888E  888E  888E   888E  888E   8888
+  8888      888E   888E  888E 8888.+"      X888  888X  888X 9888  9888    8888    8888.+"      4888>           888R     888E  888E  888E   888E  888E   8888
+ .8888Lu=   888E   888E  888F 8888L       .X888  888X. 888~ 9888  9888   .8888Lu= 8888L       .d888L .+        888R     888E  888E  888E   888E  888E  .8888Lu=
+ ^ 888*     888&  .888N..888  '8888c. .+  ` 88 ``"*888Y"    9888  9888   ^ 888*   '8888c. .+  ^"8888*"        .888B .   888&  888& .888E   888E  888E  ^ 888*
+   'Y"      R888"  `"888*""    "88888       `~     `"       "888*""888"    'Y"     "88888        "Y"          ^*888     R888" *888" 888&  m888N= 888>    'Y"
+             ""       ""         "YP'                        ^Y"   ^Y'               "YP'                       "        ""    `"   "888E  `Y"   888
+                                                                                                                              .dWi   `88E       J88"
+                                                                                                                              4888~  J8         @
+                                                                                                                               ^"===*"`       :"
+</pre>
+
+---
+
+An Omarchy theme for your Arch Linux / Hyprland setup. Warm paper, teal water, and terracotta — the light half of the Tidewater pair, tuned for a readable terminal and a full palette of terminal colours for TUIs.
+
+![Tidewater Light Theme Screenshot](preview.png)
+
+## Installation
+
+To install this theme, simply use the `omarchy theme install` command: `omarchy theme install https://github.com/signaldirective/tidewater-light`
+
+**Theme by [Signal Directive](https://ko-fi.com/signaldirective)**
diff --git a/themes/tidewater-light/backgrounds/eduardo-rodriguez-SgfN_bmO4rE-unsplash.jpg b/themes/tidewater-light/backgrounds/eduardo-rodriguez-SgfN_bmO4rE-unsplash.jpg
new file mode 100644
index 0000000..75a7c7f
Binary files /dev/null and b/themes/tidewater-light/backgrounds/eduardo-rodriguez-SgfN_bmO4rE-unsplash.jpg differ
diff --git a/themes/tidewater-light/backgrounds/sebastian-svenson-LpbyDENbQQg-unsplash.jpg b/themes/tidewater-light/backgrounds/sebastian-svenson-LpbyDENbQQg-unsplash.jpg
new file mode 100644
index 0000000..ee6478c
Binary files /dev/null and b/themes/tidewater-light/backgrounds/sebastian-svenson-LpbyDENbQQg-unsplash.jpg differ
diff --git a/themes/tidewater-light/colors.toml b/themes/tidewater-light/colors.toml
new file mode 100644
index 0000000..f6a0c51
--- /dev/null
+++ b/themes/tidewater-light/colors.toml
@@ -0,0 +1,35 @@
+# Tidewater Light
+# Warm paper palette: teal water, terracotta, sun-bleached sand.
+# Companion to tidewater-dark; same hues, mirrored lightness.
+
+mode = "light"
+
+accent = "#287874"
+selection = "#d3e2df"
+muted = "#8b9d99"
+
+background = "#f7f3ea"
+dark_background = "#f0eade"
+darker_background = "#e8e1d2"
+lighter_background = "#fcfaf4"
+
+foreground = "#1c2b2a"
+dark_foreground = "#5f7471"
+light_foreground = "#3c5251"
+bright_foreground = "#0f1c1b"
+
+red = "#c04833"
+yellow = "#956e18"
+orange = "#b15b2a"
+green = "#3c7a57"
+cyan = "#267a77"
+blue = "#3a6f9c"
+magenta = "#a74f78"
+brown = "#805c3f"
+
+bright_red = "#b43a28"
+bright_yellow = "#8a6111"
+bright_green = "#326f4b"
+bright_cyan = "#1f6e6a"
+bright_blue = "#2e6289"
+bright_magenta = "#954069"
diff --git a/themes/tidewater-light/icons.theme b/themes/tidewater-light/icons.theme
new file mode 100644
index 0000000..5bab945
--- /dev/null
+++ b/themes/tidewater-light/icons.theme
@@ -0,0 +1 @@
+Yaru-prussiangreen
diff --git a/themes/tidewater-light/preview.png b/themes/tidewater-light/preview.png
new file mode 100644
index 0000000..5f447e4
Binary files /dev/null and b/themes/tidewater-light/preview.png differ
diff --git a/themes/tokyo-night/backgrounds/0-winding-road.webp b/themes/tokyo-night/backgrounds/0-winding-road.webp
new file mode 100644
index 0000000..2f1f8d5
Binary files /dev/null and b/themes/tokyo-night/backgrounds/0-winding-road.webp differ
diff --git a/themes/tokyo-night/backgrounds/1-quattro.webp b/themes/tokyo-night/backgrounds/1-quattro.webp
new file mode 100644
index 0000000..af00176
Binary files /dev/null and b/themes/tokyo-night/backgrounds/1-quattro.webp differ
diff --git a/themes/tokyo-night/backgrounds/2-swirl-buck.webp b/themes/tokyo-night/backgrounds/2-swirl-buck.webp
new file mode 100644
index 0000000..ba6f892
Binary files /dev/null and b/themes/tokyo-night/backgrounds/2-swirl-buck.webp differ
diff --git a/themes/tokyo-night/backgrounds/3-sunset-lake.webp b/themes/tokyo-night/backgrounds/3-sunset-lake.webp
new file mode 100644
index 0000000..1599219
Binary files /dev/null and b/themes/tokyo-night/backgrounds/3-sunset-lake.webp differ
diff --git a/themes/tokyo-night/backgrounds/4-omakub.webp b/themes/tokyo-night/backgrounds/4-omakub.webp
new file mode 100644
index 0000000..70a4710
Binary files /dev/null and b/themes/tokyo-night/backgrounds/4-omakub.webp differ
diff --git a/themes/tokyo-night/backgrounds/5-oma-cityscape.jpg b/themes/tokyo-night/backgrounds/5-oma-cityscape.jpg
new file mode 100644
index 0000000..f57916b
Binary files /dev/null and b/themes/tokyo-night/backgrounds/5-oma-cityscape.jpg differ
diff --git a/themes/tokyo-night/backgrounds/6-oma.webp b/themes/tokyo-night/backgrounds/6-oma.webp
new file mode 100644
index 0000000..6875c00
Binary files /dev/null and b/themes/tokyo-night/backgrounds/6-oma.webp differ
diff --git a/themes/tokyo-night/backgrounds/omarchy.webp b/themes/tokyo-night/backgrounds/omarchy.webp
new file mode 100644
index 0000000..f461816
Binary files /dev/null and b/themes/tokyo-night/backgrounds/omarchy.webp differ
diff --git a/themes/tokyo-night/colors.toml b/themes/tokyo-night/colors.toml
index fe51dd0..58e6785 100644
--- a/themes/tokyo-night/colors.toml
+++ b/themes/tokyo-night/colors.toml
@@ -1,23 +1,31 @@
-accent = "#7aa2f7"
-cursor = "#c0caf5"
-foreground = "#a9b1d6"
-background = "#1a1b26"
-selection_foreground = "#c0caf5"
-selection_background = "#7aa2f7"
+mode = "dark"
 
-color0 = "#32344a"
-color1 = "#f7768e"
-color2 = "#9ece6a"
-color3 = "#e0af68"
-color4 = "#7aa2f7"
-color5 = "#ad8ee6"
-color6 = "#449dab"
-color7 = "#787c99"
-color8 = "#444b6a"
-color9 = "#ff7a93"
-color10 = "#b9f27c"
-color11 = "#ff9e64"
-color12 = "#7da6ff"
-color13 = "#bb9af7"
-color14 = "#0db9d7"
-color15 = "#acb0d0"
+accent = "#7aa2f7"
+selection = "#292e42"
+muted = "#414868"
+
+background = "#1a1b26"
+dark_background = "#13141c"
+darker_background = "#0e0e14"
+lighter_background = "#24283b"
+
+foreground = "#a9b1d6"
+dark_foreground = "#565f89"
+light_foreground = "#b4bee6"
+bright_foreground = "#c0caf5"
+
+red = "#f7768e"
+yellow = "#e0af68"
+orange = "#eb927b"
+green = "#9ece6a"
+cyan = "#449dab"
+blue = "#7aa2f7"
+magenta = "#ad8ee6"
+brown = "#75493d"
+
+bright_red = "#ff7a93"
+bright_yellow = "#ff9e64"
+bright_green = "#b9f27c"
+bright_cyan = "#0db9d7"
+bright_blue = "#7da6ff"
+bright_magenta = "#bb9af7"
diff --git a/themes/tokyo-night/shell.lock.toml b/themes/tokyo-night/shell.lock.toml
new file mode 100644
index 0000000..8072072
--- /dev/null
+++ b/themes/tokyo-night/shell.lock.toml
@@ -0,0 +1,6 @@
+text             = "#a9b1d6"
+placeholder      = "#a9b1d6"
+text-error       = "#a9b1d6"
+border           = "#a9b1d6"
+border-active    = "#a9b1d6"
+border-error     = "#a9b1d6"
diff --git a/themes/vantablack/backgrounds/0-dot-hands.webp b/themes/vantablack/backgrounds/0-dot-hands.webp
new file mode 100644
index 0000000..1732696
Binary files /dev/null and b/themes/vantablack/backgrounds/0-dot-hands.webp differ
diff --git a/themes/vantablack/backgrounds/1-twisted-stairs.webp b/themes/vantablack/backgrounds/1-twisted-stairs.webp
new file mode 100644
index 0000000..b6a773e
Binary files /dev/null and b/themes/vantablack/backgrounds/1-twisted-stairs.webp differ
diff --git a/themes/vantablack/backgrounds/2-layers-deep.webp b/themes/vantablack/backgrounds/2-layers-deep.webp
new file mode 100644
index 0000000..c31e132
Binary files /dev/null and b/themes/vantablack/backgrounds/2-layers-deep.webp differ
diff --git a/themes/vantablack/backgrounds/3-layers-stacked.webp b/themes/vantablack/backgrounds/3-layers-stacked.webp
new file mode 100644
index 0000000..8eb68a7
Binary files /dev/null and b/themes/vantablack/backgrounds/3-layers-stacked.webp differ
diff --git a/themes/vantablack/backgrounds/omarchy.webp b/themes/vantablack/backgrounds/omarchy.webp
new file mode 100644
index 0000000..08582ee
Binary files /dev/null and b/themes/vantablack/backgrounds/omarchy.webp differ
diff --git a/themes/vantablack/colors.toml b/themes/vantablack/colors.toml
index 45b8213..9a8a8e4 100644
--- a/themes/vantablack/colors.toml
+++ b/themes/vantablack/colors.toml
@@ -1,31 +1,31 @@
-# UI Colors (extended)
+mode = "dark"
+
 accent = "#8d8d8d"
-cursor = "#ffffff"
+selection = "#1a1a1a"
+muted = "#7a7a7a"
 
-# Primary colors
-foreground = "#ffffff"
 background = "#000000"
+dark_background = "#090909"
+darker_background = "#070707"
+lighter_background = "#1a1a1a"
 
-# Selection colors
-selection_foreground = "#000000"
-selection_background = "#ffffff"
+foreground = "#ffffff"
+dark_foreground = "#505050"
+light_foreground = "#ececec"
+bright_foreground = "#ffffff"
 
-# Normal colors (ANSI 0-7)
-color0 = "#404040"
-color1 = "#a4a4a4"
-color2 = "#b6b6b6"
-color3 = "#cecece"
-color4 = "#8d8d8d"
-color5 = "#9b9b9b"
-color6 = "#b0b0b0"
-color7 = "#ececec"
+red = "#a4a4a4"
+yellow = "#cecece"
+orange = "#b9b9b9"
+green = "#b6b6b6"
+cyan = "#b0b0b0"
+blue = "#8d8d8d"
+magenta = "#9b9b9b"
+brown = "#5c5c5c"
 
-# Bright colors (ANSI 8-15)
-color8 = "#5c5c5c"
-color9 = "#a4a4a4"
-color10 = "#b6b6b6"
-color11 = "#cecece"
-color12 = "#8d8d8d"
-color13 = "#9b9b9b"
-color14 = "#b0b0b0"
-color15 = "#ffffff"
+bright_red = "#a4a4a4"
+bright_yellow = "#cecece"
+bright_green = "#b6b6b6"
+bright_cyan = "#b0b0b0"
+bright_blue = "#8d8d8d"
+bright_magenta = "#9b9b9b"
diff --git a/themes/white/backgrounds/1-white.webp b/themes/white/backgrounds/1-white.webp
new file mode 100644
index 0000000..706f8cb
Binary files /dev/null and b/themes/white/backgrounds/1-white.webp differ
diff --git a/themes/white/backgrounds/2-white.webp b/themes/white/backgrounds/2-white.webp
new file mode 100644
index 0000000..9471bcb
Binary files /dev/null and b/themes/white/backgrounds/2-white.webp differ
diff --git a/themes/white/backgrounds/3-white.webp b/themes/white/backgrounds/3-white.webp
new file mode 100644
index 0000000..9e1711f
Binary files /dev/null and b/themes/white/backgrounds/3-white.webp differ
diff --git a/themes/white/backgrounds/omarchy.webp b/themes/white/backgrounds/omarchy.webp
new file mode 100644
index 0000000..c398553
Binary files /dev/null and b/themes/white/backgrounds/omarchy.webp differ
diff --git a/themes/white/colors.toml b/themes/white/colors.toml
index e6e072e..f179fc4 100644
--- a/themes/white/colors.toml
+++ b/themes/white/colors.toml
@@ -1,31 +1,29 @@
-# UI Colors (extended)
+mode = "light"
+
 accent = "#6e6e6e"
-cursor = "#000000"
+selection = "#c0c0c0"
+muted = "#808080"
 
-# Primary colors
-foreground = "#000000"
 background = "#ffffff"
+dark_background = "#f5f5f5"
+darker_background = "#e8e8e8"
+lighter_background = "#c0c0c0"
 
-# Selection colors
-selection_foreground = "#ffffff"
-selection_background = "#1a1a1a"
+foreground = "#000000"
+dark_foreground = "#c0c0c0"
+light_foreground = "#000000"
+bright_foreground = "#000000"
 
-# Normal colors (ANSI 0-7)
-color0 = "#c0c0c0"
-color1 = "#2a2a2a"
-color2 = "#3a3a3a"
-color3 = "#4a4a4a"
-color4 = "#1a1a1a"
-color5 = "#2e2e2e"
-color6 = "#3e3e3e"
-color7 = "#000000"
+red = "#2a2a2a"
+yellow = "#4a4a4a"
+green = "#3a3a3a"
+cyan = "#3e3e3e"
+blue = "#1a1a1a"
+magenta = "#2e2e2e"
 
-# Bright colors (ANSI 8-15)
-color8 = "#c0c0c0"
-color9 = "#2a2a2a"
-color10 = "#3a3a3a"
-color11 = "#4a4a4a"
-color12 = "#1a1a1a"
-color13 = "#2e2e2e"
-color14 = "#3e3e3e"
-color15 = "#000000"
+bright_red = "#2a2a2a"
+bright_yellow = "#4a4a4a"
+bright_green = "#3a3a3a"
+bright_cyan = "#3e3e3e"
+bright_blue = "#1a1a1a"
+bright_magenta = "#2e2e2e"