diff --git a/bin/omarchy-theme-set-templates b/bin/omarchy-theme-set-templates
index fde3ad1810..5e97bfc2a7 100755
--- a/bin/omarchy-theme-set-templates
+++ b/bin/omarchy-theme-set-templates
@@ -11,6 +11,18 @@ hex_to_rgb() {
   printf "%d,%d,%d" "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
 }
 
+# Emit sed substitution rules for a given key/value pair (plain, _strip, _rgb)
+emit_sed_rules() {
+  local key="$1" value="$2"
+  printf 's|{{ %s }}|%s|g\n' "$key" "$value"
+  printf 's|{{ %s_strip }}|%s|g\n' "$key" "${value#\#}"
+  if [[ $value =~ ^# ]]; then
+    local rgb
+    rgb=$(hex_to_rgb "$value")
+    echo "s|{{ ${key}_rgb }}|${rgb}|g"
+  fi
+}
+
 # Only generate dynamic templates for themes with a colors.toml definition
 if [[ -f $COLORS_FILE ]]; then
   sed_script=$(mktemp)
@@ -21,12 +33,7 @@ if [[ -f $COLORS_FILE ]]; then
     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
+    emit_sed_rules "$key" "$value"
   done <"$COLORS_FILE" >"$sed_script"
 
   shopt -s nullglob
diff --git a/default/themed/alacritty.toml.tpl b/default/themed/alacritty.toml.tpl
index ff8bc8dfd5..97834dd55f 100644
--- a/default/themed/alacritty.toml.tpl
+++ b/default/themed/alacritty.toml.tpl
@@ -12,11 +12,11 @@ cursor = "{{ cursor }}"
 
 [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 = "{{ bg }}"
+red = "{{ red }}"
+green = "{{ green }}"
+yellow = "{{ yellow }}"
+blue = "{{ blue }}"
+magenta = "{{ purple }}"
+cyan = "{{ cyan }}"
+white = "{{ fg }}"
 
 [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_purple }}"
+cyan = "{{ bright_cyan }}"
+white = "{{ bright_fg }}"
diff --git a/default/themed/btop.theme.tpl b/default/themed/btop.theme.tpl
index 7b1b299d6a..b9a263c13f 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_fg }}"
 
 # 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_fg }}"
 
 # CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="{{ color5 }}"
-theme[mem_box]="{{ color2 }}"
-theme[net_box]="{{ color1 }}"
+theme[cpu_box]="{{ purple }}"
+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 }}"
-
-# CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="{{ color6 }}"
-theme[cpu_mid]="{{ color4 }}"
-theme[cpu_end]="{{ color5 }}"
-
-# Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="{{ color5 }}"
-theme[free_mid]="{{ color4 }}"
-theme[free_end]="{{ color6 }}"
-
-# Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="{{ color4 }}"
-theme[cached_mid]="{{ color6 }}"
-theme[cached_end]="{{ color5 }}"
-
-# Mem/Disk available meter (Peach -> Red)
-theme[available_start]="{{ color3 }}"
-theme[available_mid]="{{ color1 }}"
-theme[available_end]="{{ color1 }}"
-
-# Mem/Disk used meter (Green -> Sky)
-theme[used_start]="{{ color2 }}"
-theme[used_mid]="{{ color6 }}"
-theme[used_end]="{{ color4 }}"
-
-# Download graph colors (Peach -> Red)
-theme[download_start]="{{ color3 }}"
-theme[download_mid]="{{ color1 }}"
-theme[download_end]="{{ color1 }}"
-
-# Upload graph colors (Green -> Sky)
-theme[upload_start]="{{ color2 }}"
-theme[upload_mid]="{{ color6 }}"
-theme[upload_end]="{{ color4 }}"
-
-# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="{{ color6 }}"
-theme[process_mid]="{{ color4 }}"
-theme[process_end]="{{ color5 }}"
+theme[temp_start]="{{ green }}"
+theme[temp_mid]="{{ yellow }}"
+theme[temp_end]="{{ red }}"
+
+# CPU graph colors (Teal -> Blue -> Purple)
+theme[cpu_start]="{{ cyan }}"
+theme[cpu_mid]="{{ blue }}"
+theme[cpu_end]="{{ purple }}"
+
+# Mem/Disk free meter
+theme[free_start]="{{ purple }}"
+theme[free_mid]="{{ blue }}"
+theme[free_end]="{{ cyan }}"
+
+# Mem/Disk cached meter
+theme[cached_start]="{{ blue }}"
+theme[cached_mid]="{{ cyan }}"
+theme[cached_end]="{{ purple }}"
+
+# Mem/Disk available meter
+theme[available_start]="{{ yellow }}"
+theme[available_mid]="{{ red }}"
+theme[available_end]="{{ red }}"
+
+# Mem/Disk used meter (Green -> Teal -> Blue)
+theme[used_start]="{{ green }}"
+theme[used_mid]="{{ cyan }}"
+theme[used_end]="{{ blue }}"
+
+# Download graph colors
+theme[download_start]="{{ yellow }}"
+theme[download_mid]="{{ red }}"
+theme[download_end]="{{ red }}"
+
+# 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
+theme[process_start]="{{ cyan }}"
+theme[process_mid]="{{ blue }}"
+theme[process_end]="{{ purple }}"
+
+# Graph gradient colors (spectrum shades from background to foreground)
+theme[gradient_color_0]="{{ bg }}"
+theme[gradient_color_1]="{{ lighter_bg }}"
+theme[gradient_color_2]="{{ selection }}"
+theme[gradient_color_3]="{{ muted }}"
+theme[gradient_color_4]="{{ dark_fg }}"
+theme[gradient_color_5]="{{ fg }}"
+theme[gradient_color_6]="{{ light_fg }}"
+theme[gradient_color_7]="{{ bright_fg }}"
diff --git a/default/themed/ghostty.conf.tpl b/default/themed/ghostty.conf.tpl
index bafc649808..7e7d7d8dba 100644
--- a/default/themed/ghostty.conf.tpl
+++ b/default/themed/ghostty.conf.tpl
@@ -4,19 +4,19 @@ cursor-color = {{ cursor }}
 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={{ bg }}
+palette = 1={{ red }}
+palette = 2={{ green }}
+palette = 3={{ yellow }}
+palette = 4={{ blue }}
+palette = 5={{ purple }}
+palette = 6={{ cyan }}
+palette = 7={{ fg }}
+palette = 8={{ muted }}
+palette = 9={{ bright_red }}
+palette = 10={{ bright_green }}
+palette = 11={{ bright_yellow }}
+palette = 12={{ bright_blue }}
+palette = 13={{ bright_purple }}
+palette = 14={{ bright_cyan }}
+palette = 15={{ bright_fg }}
diff --git a/default/themed/hyprland-preview-share-picker.css.tpl b/default/themed/hyprland-preview-share-picker.css.tpl
index 07e5e4e89f..f62f8b17df 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_bg }};
 @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/kitty.conf.tpl b/default/themed/kitty.conf.tpl
index e74a5bbc33..5b9e99a823 100644
--- a/default/themed/kitty.conf.tpl
+++ b/default/themed/kitty.conf.tpl
@@ -9,19 +9,19 @@ 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 {{ bg }}
+color1 {{ red }}
+color2 {{ green }}
+color3 {{ yellow }}
+color4 {{ blue }}
+color5 {{ purple }}
+color6 {{ cyan }}
+color7 {{ fg }}
+color8 {{ muted }}
+color9 {{ bright_red }}
+color10 {{ bright_green }}
+color11 {{ bright_yellow }}
+color12 {{ bright_blue }}
+color13 {{ bright_purple }}
+color14 {{ bright_cyan }}
+color15 {{ bright_fg }}
diff --git a/default/themed/obsidian.css.tpl b/default/themed/obsidian.css.tpl
index 90b8624429..46042d7079 100644
--- a/default/themed/obsidian.css.tpl
+++ b/default/themed/obsidian.css.tpl
@@ -12,45 +12,45 @@
   --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: {{ purple }};
+  --text-title-h6: {{ purple }};
 
   /* Links and accents */
-  --text-link: {{ color4 }};
+  --text-link: {{ blue }};
   --text-accent: {{ accent }};
   --text-accent-hover: {{ accent }};
   --interactive-accent: {{ accent }};
   --interactive-accent-hover: {{ accent }};
 
   /* Muted text */
-  --text-muted: {{ color8 }};
-  --text-faint: {{ color8 }};
+  --text-muted: {{ muted }};
+  --text-faint: {{ muted }};
 
   /* 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/themes/catppuccin-latte/btop.theme b/themes/catppuccin-latte/btop.theme
deleted file mode 100644
index 87ed181774..0000000000
--- a/themes/catppuccin-latte/btop.theme
+++ /dev/null
@@ -1,84 +0,0 @@
-# https://github.com/catppuccin/btop/blob/main/themes/catppuccin_latte.theme
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#eff1f5"
-
-# Main text color
-theme[main_fg]="#4c4f69"
-
-# Title color for boxes
-theme[title]="#4c4f69"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#1e66f5"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#bcc0cc"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#1e66f5"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#8c8fa1"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#dc8a78"
-
-# Background color of the percentage meters
-theme[meter_bg]="#bcc0cc"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#dc8a78"
-
-# CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="#8839ef" #Mauve
-theme[mem_box]="#40a02b" #Green
-theme[net_box]="#e64553" #Maroon
-theme[proc_box]="#1e66f5" #Blue
-
-# Box divider line and small boxes line color
-theme[div_line]="#9ca0b0"
-
-# Temperature graph color (Green -> Yellow -> Red)
-theme[temp_start]="#40a02b"
-theme[temp_mid]="#df8e1d"
-theme[temp_end]="#d20f39"
-
-# CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="#179299"
-theme[cpu_mid]="#209fb5"
-theme[cpu_end]="#7287fd"
-
-# Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="#8839ef"
-theme[free_mid]="#7287fd"
-theme[free_end]="#1e66f5"
-
-# Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="#209fb5"
-theme[cached_mid]="#1e66f5"
-theme[cached_end]="#7287fd"
-
-# Mem/Disk available meter (Peach -> Red)
-theme[available_start]="#fe640b"
-theme[available_mid]="#e64553"
-theme[available_end]="#d20f39"
-
-# Mem/Disk used meter (Green -> Sky)
-theme[used_start]="#40a02b"
-theme[used_mid]="#179299"
-theme[used_end]="#04a5e5"
-
-# Download graph colors (Peach -> Red)
-theme[download_start]="#fe640b"
-theme[download_mid]="#e64553"
-theme[download_end]="#d20f39"
-
-# Upload graph colors (Green -> Sky)
-theme[upload_start]="#40a02b"
-theme[upload_mid]="#179299"
-theme[upload_end]="#04a5e5"
-
-# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="#209fb5"
-theme[process_mid]="#7287fd"
-theme[process_end]="#8839ef"
diff --git a/themes/catppuccin-latte/colors.toml b/themes/catppuccin-latte/colors.toml
index 87c37d4aa6..080b3f57e9 100644
--- a/themes/catppuccin-latte/colors.toml
+++ b/themes/catppuccin-latte/colors.toml
@@ -5,19 +5,28 @@ background = "#eff1f5"
 selection_foreground = "#eff1f5"
 selection_background = "#dc8a78"
 
-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"
+bg = "#eff1f5"
+lighter_bg = "#dce0e8"
+selection = "#ccd0da"
+muted = "#acb0be"
+dark_fg = "#9ca0b0"
+fg = "#8c8fa1"
+light_fg = "#5c5f77"
+bright_fg = "#4c4f69"
+
+red = "#d20f39"
+yellow = "#df8e1d"
+orange = "#d84e2b"
+green = "#40a02b"
+cyan = "#179299"
+blue = "#1e66f5"
+purple = "#ea76cb"
+brown = "#6c2715"
+dark_bg = "#e3e4e8"
+darker_bg = "#d7d8dc"
+bright_red = "#d20f39"
+bright_yellow = "#df8e1d"
+bright_green = "#40a02b"
+bright_cyan = "#179299"
+bright_blue = "#1e66f5"
+bright_purple = "#ea76cb"
diff --git a/themes/catppuccin/btop.theme b/themes/catppuccin/btop.theme
deleted file mode 100644
index f0395b35cc..0000000000
--- a/themes/catppuccin/btop.theme
+++ /dev/null
@@ -1,83 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#1E1E2E"
-
-# Main text color
-theme[main_fg]="#c6d0f5"
-
-# Title color for boxes
-theme[title]="#c6d0f5"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#8caaee"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#51576d"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#8caaee"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#838ba7"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#f2d5cf"
-
-# Background color of the percentage meters
-theme[meter_bg]="#51576d"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#f2d5cf"
-
-# CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="#ca9ee6" #Mauve
-theme[mem_box]="#a6d189" #Green
-theme[net_box]="#ea999c" #Maroon
-theme[proc_box]="#8caaee" #Blue
-
-# Box divider line and small boxes line color
-theme[div_line]="#737994"
-
-# Temperature graph color (Green -> Yellow -> Red)
-theme[temp_start]="#a6d189"
-theme[temp_mid]="#e5c890"
-theme[temp_end]="#e78284"
-
-# CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="#81c8be"
-theme[cpu_mid]="#85c1dc"
-theme[cpu_end]="#babbf1"
-
-# Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="#ca9ee6"
-theme[free_mid]="#babbf1"
-theme[free_end]="#8caaee"
-
-# Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="#85c1dc"
-theme[cached_mid]="#8caaee"
-theme[cached_end]="#babbf1"
-
-# Mem/Disk available meter (Peach -> Red)
-theme[available_start]="#ef9f76"
-theme[available_mid]="#ea999c"
-theme[available_end]="#e78284"
-
-# Mem/Disk used meter (Green -> Sky)
-theme[used_start]="#a6d189"
-theme[used_mid]="#81c8be"
-theme[used_end]="#99d1db"
-
-# Download graph colors (Peach -> Red)
-theme[download_start]="#ef9f76"
-theme[download_mid]="#ea999c"
-theme[download_end]="#e78284"
-
-# Upload graph colors (Green -> Sky)
-theme[upload_start]="#a6d189"
-theme[upload_mid]="#81c8be"
-theme[upload_end]="#99d1db"
-
-# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="#85c1dc"
-theme[process_mid]="#babbf1"
-theme[process_end]="#ca9ee6"
diff --git a/themes/catppuccin/colors.toml b/themes/catppuccin/colors.toml
index 6943ef1ff9..414681c1d2 100644
--- a/themes/catppuccin/colors.toml
+++ b/themes/catppuccin/colors.toml
@@ -5,19 +5,28 @@ background = "#1e1e2e"
 selection_foreground = "#1e1e2e"
 selection_background = "#f5e0dc"
 
-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"
+bg = "#1e1e2e"
+lighter_bg = "#313244"
+selection = "#45475a"
+muted = "#585b70"
+dark_fg = "#6c7086"
+fg = "#9399b2"
+light_fg = "#bac2de"
+bright_fg = "#cdd6f4"
+
+red = "#f38ba8"
+yellow = "#f9e2af"
+orange = "#f6b6ab"
+green = "#a6e3a1"
+cyan = "#94e2d5"
+blue = "#89b4fa"
+purple = "#f5c2e7"
+brown = "#7b5b55"
+dark_bg = "#161622"
+darker_bg = "#101019"
+bright_red = "#f38ba8"
+bright_yellow = "#f9e2af"
+bright_green = "#a6e3a1"
+bright_cyan = "#94e2d5"
+bright_blue = "#89b4fa"
+bright_purple = "#f5c2e7"
diff --git a/themes/ethereal/btop.theme b/themes/ethereal/btop.theme
deleted file mode 100644
index 135da3db04..0000000000
--- a/themes/ethereal/btop.theme
+++ /dev/null
@@ -1,70 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#060B1E"
-
-# Main text color
-theme[main_fg]="#ffcead"
-
-# Title color for boxes
-theme[title]="#c89dc1"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#a3bfd1"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#6d7db6"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#ffcead"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#6d7db6"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#c89dc1"
-
-# Box outline and divider line color
-theme[cpu_box]="#92a593"
-theme[mem_box]="#92a593"
-theme[net_box]="#92a593"
-theme[proc_box]="#92a593"
-theme[div_line]="#6d7db6"
-
-# Gradient for all meters and graphs
-theme[temp_start]="#a3bfd1"
-theme[temp_mid]="#7d82d9"
-theme[temp_end]="#92a593"
-
-
-theme[cpu_start]="#a3bfd1"
-theme[cpu_mid]="#7d82d9"
-theme[cpu_end]="#92a593"
-
-
-theme[free_start]="#7d82d9"
-theme[free_mid]="#E9BB4F"
-theme[free_end]="#E9BB4F"
-
-
-theme[cached_start]="#E9BB4F"
-theme[cached_mid]="#E9BB4F"
-theme[cached_end]="#E9BB4F"
-
-
-theme[available_start]="#a3bfd1"
-theme[available_mid]="#a3bfd1"
-theme[available_end]="#a3bfd1"
-
-
-theme[used_start]="#92a593"
-theme[used_mid]="#92a593"
-theme[used_end]="#92a593"
-
-
-theme[download_start]="#E9BB4F"
-theme[download_mid]="#a3bfd1"
-theme[download_end]="#7d82d9"
-
-
-theme[upload_start]="#E9BB4F"
-theme[upload_mid]="#a3bfd1"
-theme[upload_end]="#7d82d9"
\ No newline at end of file
diff --git a/themes/ethereal/colors.toml b/themes/ethereal/colors.toml
index 75cedec806..47eeb53962 100644
--- a/themes/ethereal/colors.toml
+++ b/themes/ethereal/colors.toml
@@ -5,19 +5,28 @@ background = "#060B1E"
 selection_foreground = "#060B1E"
 selection_background = "#ffcead"
 
-color0 = "#060B1E"
-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"
+bg = "#060B1E"
+lighter_bg = "#131a3a"
+selection = "#252e56"
+muted = "#3d4573"
+dark_fg = "#6d7db6"
+fg = "#9a96a8"
+light_fg = "#c9b8a6"
+bright_fg = "#ffcead"
+
+red = "#ED5B5A"
+yellow = "#E9BB4F"
+orange = "#eb8b54"
+green = "#92a593"
+cyan = "#a3bfd1"
+blue = "#7d82d9"
+purple = "#c89dc1"
+brown = "#75452a"
+dark_bg = "#040816"
+darker_bg = "#030610"
+bright_red = "#faaaa9"
+bright_yellow = "#f7dc9c"
+bright_green = "#c4cfc4"
+bright_cyan = "#dfeaf0"
+bright_blue = "#c2c4f0"
+bright_purple = "#ead7e7"
diff --git a/themes/everforest/btop.theme b/themes/everforest/btop.theme
deleted file mode 100644
index 2ad33bbee6..0000000000
--- a/themes/everforest/btop.theme
+++ /dev/null
@@ -1,92 +0,0 @@
-# All graphs and meters can be gradients
-# For single color graphs leave "mid" and "end" variable empty.
-# Use "start" and "end" variables for two color gradient
-# Use "start", "mid" and "end" for three color gradient
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#2d353b"
-
-# Main text color
-theme[main_fg]="#d3c6aa"
-
-# Title color for boxes
-theme[title]="#d3c6aa"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#e67e80"
-
-# Background color of selected items
-theme[selected_bg]="#3d484d"
-
-# Foreground color of selected items
-theme[selected_fg]="#dbbc7f"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#2d353b"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#d3c6aa"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#a7c080"
-
-# Cpu box outline color
-theme[cpu_box]="#3d484d"
-
-# Memory/disks box outline color
-theme[mem_box]="#3d484d"
-
-# Net up/down box outline color
-theme[net_box]="#3d484d"
-
-# Processes box outline color
-theme[proc_box]="#3d484d"
-
-# Box divider line and small boxes line color
-theme[div_line]="#3d484d"
-
-# Temperature graph colors
-theme[temp_start]="#a7c080"
-theme[temp_mid]="#dbbc7f"
-theme[temp_end]="#f85552"
-
-# CPU graph colors
-theme[cpu_start]="#a7c080"
-theme[cpu_mid]="#dbbc7f"
-theme[cpu_end]="#f85552"
-
-# Mem/Disk free meter
-theme[free_start]="#f85552"
-theme[free_mid]="#dbbc7f"
-theme[free_end]="#a7c080"
-
-# Mem/Disk cached meter
-theme[cached_start]="#7fbbb3"
-theme[cached_mid]="#83c092"
-theme[cached_end]="#a7c080"
-
-# Mem/Disk available meter
-theme[available_start]="#f85552"
-theme[available_mid]="#dbbc7f"
-theme[available_end]="#a7c080"
-
-# Mem/Disk used meter
-theme[used_start]="#a7c080"
-theme[used_mid]="#dbbc7f"
-theme[used_end]="#f85552"
-
-# Download graph colors
-theme[download_start]="#a7c080"
-theme[download_mid]="#83c092"
-theme[download_end]="#7fbbb3"
-
-# Upload graph colors
-theme[upload_start]="#dbbc7f"
-theme[upload_mid]="#e69875"
-theme[upload_end]="#e67e80"
-
-# Process box color gradient for threads, mem and cpu usage
-theme[process_start]="#a7c080"
-theme[process_mid]="#e67e80"
-theme[process_end]="#f85552"
-
diff --git a/themes/everforest/colors.toml b/themes/everforest/colors.toml
index 9aaeeb5aa4..2912bf6549 100644
--- a/themes/everforest/colors.toml
+++ b/themes/everforest/colors.toml
@@ -5,19 +5,28 @@ background = "#2d353b"
 selection_foreground = "#2d353b"
 selection_background = "#d3c6aa"
 
-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"
+bg = "#2d353b"
+lighter_bg = "#343f44"
+selection = "#3d484d"
+muted = "#475258"
+dark_fg = "#4f585e"
+fg = "#7a8478"
+light_fg = "#9da9a0"
+bright_fg = "#d3c6aa"
+
+red = "#e67e80"
+yellow = "#dbbc7f"
+orange = "#e09d7f"
+green = "#a7c080"
+cyan = "#83c092"
+blue = "#7fbbb3"
+purple = "#d699b6"
+brown = "#704e3f"
+dark_bg = "#21272c"
+darker_bg = "#181d20"
+bright_red = "#e67e80"
+bright_yellow = "#dbbc7f"
+bright_green = "#a7c080"
+bright_cyan = "#83c092"
+bright_blue = "#7fbbb3"
+bright_purple = "#d699b6"
diff --git a/themes/flexoki-light/btop.theme b/themes/flexoki-light/btop.theme
deleted file mode 100644
index 0caf9c6546..0000000000
--- a/themes/flexoki-light/btop.theme
+++ /dev/null
@@ -1,78 +0,0 @@
-# Main bg
-theme[main_bg]="#FFFCF0"
-
-# Main text color
-theme[main_fg]="#100F0F"
-
-# Title color for boxes
-theme[title]="#100F0F"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#205EA6"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#414868"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#100F0F"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#6F6E69"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#205EA6"
-
-# Cpu box outline color
-theme[cpu_box]="#6F6E69"
-
-# Memory/disks box outline color
-theme[mem_box]="#6F6E69"
-
-# Net up/down box outline color
-theme[net_box]="#6F6E69"
-
-# Processes box outline color
-theme[proc_box]="#6F6E69"
-
-# Box divider line and small boxes line color
-theme[div_line]="#6F6E69"
-
-# Temperature graph colors
-theme[temp_start]="#66800B"
-theme[temp_mid]="#BC5215"
-theme[temp_end]="#AF3029"
-
-# CPU graph colors
-theme[cpu_start]="#66800B"
-theme[cpu_mid]="#BC5215"
-theme[cpu_end]="#AF3029"
-
-# Mem/Disk free meter
-theme[free_start]="#66800B"
-theme[free_mid]="#BC5215"
-theme[free_end]="#AF3029"
-
-# Mem/Disk cached meter
-theme[cached_start]="#66800B"
-theme[cached_mid]="#BC5215"
-theme[cached_end]="#AF3029"
-
-# Mem/Disk available meter
-theme[available_start]="#66800B"
-theme[available_mid]="#BC5215"
-theme[available_end]="#AF3029"
-
-# Mem/Disk used meter
-theme[used_start]="#66800B"
-theme[used_mid]="#BC5215"
-theme[used_end]="#AF3029"
-
-# Download graph colors
-theme[download_start]="#66800B"
-theme[download_mid]="#BC5215"
-theme[download_end]="#AF3029"
-
-# Upload graph colors
-theme[upload_start]="#66800B"
-theme[upload_mid]="#BC5215"
-theme[upload_end]="#AF3029"
diff --git a/themes/flexoki-light/colors.toml b/themes/flexoki-light/colors.toml
index 44af88c436..a0358c9992 100644
--- a/themes/flexoki-light/colors.toml
+++ b/themes/flexoki-light/colors.toml
@@ -5,19 +5,28 @@ background = "#FFFCF0"
 selection_foreground = "#100F0F"
 selection_background = "#CECDC3"
 
-color0 = "#100F0F"
-color1 = "#D14D41"
-color2 = "#879A39"
-color3 = "#D0A215"
-color4 = "#205EA6"
-color5 = "#CE5D97"
-color6 = "#3AA99F"
-color7 = "#FFFCF0"
-color8 = "#100F0F"
-color9 = "#D14D41"
-color10 = "#879A39"
-color11 = "#D0A215"
-color12 = "#4385BE"
-color13 = "#CE5D97"
-color14 = "#3AA99F"
-color15 = "#FFFCF0"
+bg = "#FFFCF0"
+lighter_bg = "#E6E4D9"
+selection = "#CECDC3"
+muted = "#B7B5AC"
+dark_fg = "#878580"
+fg = "#6F6E69"
+light_fg = "#403E3C"
+bright_fg = "#100F0F"
+
+red = "#D14D41"
+yellow = "#D0A215"
+orange = "#d0772b"
+green = "#879A39"
+cyan = "#3AA99F"
+blue = "#205EA6"
+purple = "#CE5D97"
+brown = "#683b15"
+dark_bg = "#f2efe4"
+darker_bg = "#e5e2d8"
+bright_red = "#D14D41"
+bright_yellow = "#D0A215"
+bright_green = "#879A39"
+bright_cyan = "#3AA99F"
+bright_blue = "#4385BE"
+bright_purple = "#CE5D97"
diff --git a/themes/gruvbox/btop.theme b/themes/gruvbox/btop.theme
deleted file mode 100644
index 0584954574..0000000000
--- a/themes/gruvbox/btop.theme
+++ /dev/null
@@ -1,92 +0,0 @@
-#Bashtop gruvbox (https://github.com/morhetz/gruvbox) theme
-#by BachoSeven
-
-# Colors should be in 6 or 2 character hexadecimal or single spaced rgb decimal: "#RRGGBB", "#BW" or "0-255 0-255 0-255"
-# example for white: "#FFFFFF", "#ff" or "255 255 255".
-
-# All graphs and meters can be gradients
-# For single color graphs leave "mid" and "end" variable empty.
-# Use "start" and "end" variables for two color gradient
-# Use "start", "mid" and "end" for three color gradient
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#282828"
-
-# Main text color
-theme[main_fg]="#a89984"
-
-# Title color for boxes
-theme[title]="#ebdbb2"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#d79921"
-
-# Background color of selected items
-theme[selected_bg]="#282828"
-
-# Foreground color of selected items
-theme[selected_fg]="#fabd2f"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#282828"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#585858"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#98971a"
-
-# Cpu box outline color
-theme[cpu_box]="#a89984"
-
-# Memory/disks box outline color
-theme[mem_box]="#a89984"
-
-# Net up/down box outline color
-theme[net_box]="#a89984"
-
-# Processes box outline color
-theme[proc_box]="#a89984"
-
-# Box divider line and small boxes line color
-theme[div_line]="#a89984"
-
-# Temperature graph colors
-theme[temp_start]="#458588"
-theme[temp_mid]="#d3869b"
-theme[temp_end]="#fb4394"
-
-# CPU graph colors
-theme[cpu_start]="#b8bb26"
-theme[cpu_mid]="#d79921"
-theme[cpu_end]="#fb4934"
-
-# Mem/Disk free meter
-theme[free_start]="#4e5900"
-theme[free_mid]=""
-theme[free_end]="#98971a"
-
-# Mem/Disk cached meter
-theme[cached_start]="#458588"
-theme[cached_mid]=""
-theme[cached_end]="#83a598"
-
-# Mem/Disk available meter
-theme[available_start]="#d79921"
-theme[available_mid]=""
-theme[available_end]="#fabd2f"
-
-# Mem/Disk used meter
-theme[used_start]="#cc241d"
-theme[used_mid]=""
-theme[used_end]="#fb4934"
-
-# Download graph colors
-theme[download_start]="#3d4070"
-theme[download_mid]="#6c71c4"
-theme[download_end]="#a3a8f7"
-
-# Upload graph colors
-theme[upload_start]="#701c45"
-theme[upload_mid]="#b16286"
-theme[upload_end]="#d3869b"
diff --git a/themes/gruvbox/colors.toml b/themes/gruvbox/colors.toml
index 57847f0a08..ae766c12a7 100644
--- a/themes/gruvbox/colors.toml
+++ b/themes/gruvbox/colors.toml
@@ -5,19 +5,28 @@ background = "#282828"
 selection_foreground = "#ebdbb2"
 selection_background = "#d65d0e"
 
-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"
+bg = "#282828"
+lighter_bg = "#3c3836"
+selection = "#504945"
+muted = "#665c54"
+dark_fg = "#7c6f64"
+fg = "#a89984"
+light_fg = "#bdae93"
+bright_fg = "#d4be98"
+
+red = "#ea6962"
+yellow = "#d8a657"
+orange = "#e1875c"
+green = "#a9b665"
+cyan = "#89b482"
+blue = "#7daea3"
+purple = "#d3869b"
+brown = "#70432e"
+dark_bg = "#1e1e1e"
+darker_bg = "#161616"
+bright_red = "#ea6962"
+bright_yellow = "#d8a657"
+bright_green = "#a9b665"
+bright_cyan = "#89b482"
+bright_blue = "#7daea3"
+bright_purple = "#d3869b"
diff --git a/themes/hackerman/btop.theme b/themes/hackerman/btop.theme
deleted file mode 100644
index 76091891e1..0000000000
--- a/themes/hackerman/btop.theme
+++ /dev/null
@@ -1,70 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#0B0C16"
-
-# Main text color
-theme[main_fg]="#ddf7ff"
-
-# Title color for boxes
-theme[title]="#86a7df"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#7cf8f7"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#6a6e95"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#ddf7ff"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#6a6e95"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#86a7df"
-
-# Box outline and divider line color
-theme[cpu_box]="#4fe88f"
-theme[mem_box]="#4fe88f"
-theme[net_box]="#4fe88f"
-theme[proc_box]="#4fe88f"
-theme[div_line]="#6a6e95"
-
-# Gradient for all meters and graphs
-theme[temp_start]="#7cf8f7"
-theme[temp_mid]="#829dd4"
-theme[temp_end]="#4fe88f"
-
-
-theme[cpu_start]="#7cf8f7"
-theme[cpu_mid]="#829dd4"
-theme[cpu_end]="#4fe88f"
-
-
-theme[free_start]="#829dd4"
-theme[free_mid]="#50f7d4"
-theme[free_end]="#50f7d4"
-
-
-theme[cached_start]="#50f7d4"
-theme[cached_mid]="#50f7d4"
-theme[cached_end]="#50f7d4"
-
-
-theme[available_start]="#7cf8f7"
-theme[available_mid]="#7cf8f7"
-theme[available_end]="#7cf8f7"
-
-
-theme[used_start]="#4fe88f"
-theme[used_mid]="#4fe88f"
-theme[used_end]="#4fe88f"
-
-
-theme[download_start]="#50f7d4"
-theme[download_mid]="#7cf8f7"
-theme[download_end]="#829dd4"
-
-
-theme[upload_start]="#50f7d4"
-theme[upload_mid]="#7cf8f7"
-theme[upload_end]="#829dd4"
\ No newline at end of file
diff --git a/themes/hackerman/colors.toml b/themes/hackerman/colors.toml
index 56aec2a9c4..eea1910a00 100644
--- a/themes/hackerman/colors.toml
+++ b/themes/hackerman/colors.toml
@@ -5,19 +5,28 @@ background = "#0B0C16"
 selection_foreground = "#0B0C16"
 selection_background = "#ddf7ff"
 
-color0 = "#0B0C16"
-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"
+bg = "#0B0C16"
+lighter_bg = "#151828"
+selection = "#1f253a"
+muted = "#2d3450"
+dark_fg = "#6a6e95"
+fg = "#8e95b8"
+light_fg = "#b5c5db"
+bright_fg = "#ddf7ff"
+
+red = "#50f872"
+yellow = "#50f7d4"
+orange = "#50f7a3"
+green = "#4fe88f"
+cyan = "#7cf8f7"
+blue = "#829dd4"
+purple = "#86a7df"
+brown = "#287b51"
+dark_bg = "#080910"
+darker_bg = "#06060c"
+bright_red = "#85ff9d"
+bright_yellow = "#a4ffec"
+bright_green = "#9cf7c2"
+bright_cyan = "#d1fffe"
+bright_blue = "#c4d2ed"
+bright_purple = "#cddbf4"
diff --git a/themes/kanagawa/btop.theme b/themes/kanagawa/btop.theme
deleted file mode 100644
index 5202748ded..0000000000
--- a/themes/kanagawa/btop.theme
+++ /dev/null
@@ -1,86 +0,0 @@
-# Bashtop Kanagawa-wave (https://github.com/rebelot/kanagawa.nvim) theme
-# By: philikarus
-
-# Main bg
-theme[main_bg]="#1f1f28"
-
-# Main text color
-theme[main_fg]="#dcd7ba"
-
-# Title color for boxes
-theme[title]="#dcd7ba"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#C34043"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#223249"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#dca561"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#727169"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#7aa89f"
-
-# Cpu box outline color
-theme[cpu_box]="#727169"
-
-# Memory/disks box outline color
-theme[mem_box]="#727169"
-
-# Net up/down box outline color
-theme[net_box]="#727169"
-
-# Processes box outline color
-theme[proc_box]="#727169"
-
-# Box divider line and small boxes line color
-theme[div_line]="#727169"
-
-# Temperature graph colors
-theme[temp_start]="#98BB6C"
-theme[temp_mid]="#DCA561"
-theme[temp_end]="#E82424"
-
-# CPU graph colors
-theme[cpu_start]="#98BB6C"
-theme[cpu_mid]="#DCA561"
-theme[cpu_end]="#E82424"
-
-# Mem/Disk free meter
-theme[free_start]="#E82424"
-theme[free_mid]="#C34043"
-theme[free_end]="#FF5D62"
-
-# Mem/Disk cached meter
-theme[cached_start]="#C0A36E"
-theme[cached_mid]="#DCA561"
-theme[cached_end]="#FF9E3B"
-
-# Mem/Disk available meter
-theme[available_start]="#938AA9"
-theme[available_mid]="#957FBB"
-theme[available_end]="#9CABCA"
-
-# Mem/Disk used meter
-theme[used_start]="#658594"
-theme[used_mid]="#7E9CDB"
-theme[used_end]="#7FB4CA"
-
-# Download graph colors
-theme[download_start]="#7E9CDB"
-theme[download_mid]="#938AA9"
-theme[download_end]="#957FBB"
-
-# Upload graph colors
-theme[upload_start]="#DCA561"
-theme[upload_mid]="#E6C384"
-theme[upload_end]="#E82424"
-
-# Process box color gradient for threads, mem and cpu usage
-theme[process_start]="#98BB6C"
-theme[process_mid]="#DCA561"
-theme[process_end]="#C34043"
diff --git a/themes/kanagawa/colors.toml b/themes/kanagawa/colors.toml
index 7ca002eefe..59fc45b19c 100644
--- a/themes/kanagawa/colors.toml
+++ b/themes/kanagawa/colors.toml
@@ -5,19 +5,28 @@ background = "#1f1f28"
 selection_foreground = "#c8c093"
 selection_background = "#2d4f67"
 
-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"
+bg = "#1f1f28"
+lighter_bg = "#223249"
+selection = "#363646"
+muted = "#54546D"
+dark_fg = "#727169"
+fg = "#938aa9"
+light_fg = "#c8c093"
+bright_fg = "#dcd7ba"
+
+red = "#c34043"
+yellow = "#c0a36e"
+orange = "#c17158"
+green = "#76946a"
+cyan = "#6a9589"
+blue = "#7e9cd8"
+purple = "#957fb8"
+brown = "#60382c"
+dark_bg = "#17171e"
+darker_bg = "#111116"
+bright_red = "#e82424"
+bright_yellow = "#e6c384"
+bright_green = "#98bb6c"
+bright_cyan = "#7aa89f"
+bright_blue = "#7fb4ca"
+bright_purple = "#938aa9"
diff --git a/themes/matte-black/btop.theme b/themes/matte-black/btop.theme
deleted file mode 100644
index c8cdcd02f5..0000000000
--- a/themes/matte-black/btop.theme
+++ /dev/null
@@ -1,92 +0,0 @@
-# ────────────────────────────────────────────────────────────
-# Bashtop theme - Omarchy Matte Black
-# by tahayvr
-# https://github.com/tahayvr
-# ────────────────────────────────────────────────────────────
-
-# Colors should be in 6 or 2 character hexadecimal or single spaced rgb decimal: "#RRGGBB", "#BW" or "0-255 0-255 0-255"
-# example for white: "#ffffff", "#ff" or "255 255 255".
-
-# All graphs and meters can be gradients
-# For single color graphs leave "mid" and "end" variable empty.
-# Use "start" and "end" variables for two color gradient
-# Use "start", "mid" and "end" for three color gradient
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]=""
-
-# Main text color
-theme[main_fg]="#EAEAEA"
-
-# Title color for boxes
-theme[title]="#8a8a8d"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#f59e0b"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#f59e0b"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#EAEAEA"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#333333"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#8a8a8d"
-
-# Cpu box outline color
-theme[cpu_box]="#8a8a8d"
-
-# Memory/disks box outline color
-theme[mem_box]="#8a8a8d"
-
-# Net up/down box outline color
-theme[net_box]="#8a8a8d"
-
-# Processes box outline color
-theme[proc_box]="#8a8a8d"
-
-# Box divider line and small boxes line color
-theme[div_line]="#8a8a8d"
-
-# Temperature graph colors
-theme[temp_start]="#8a8a8d"
-theme[temp_mid]="#f59e0b"
-theme[temp_end]="#b91c1c"
-
-# CPU graph colors
-theme[cpu_start]="#8a8a8d"
-theme[cpu_mid]="#f59e0b"
-theme[cpu_end]="#b91c1c"
-
-# Mem/Disk free meter
-theme[free_start]="#8a8a8d"
-theme[free_mid]="#f59e0b"
-theme[free_end]="#b91c1c"
-
-# Mem/Disk cached meter
-theme[cached_start]="#8a8a8d"
-theme[cached_mid]="#f59e0b"
-theme[cached_end]="#b91c1c"
-
-# Mem/Disk available meter
-theme[available_start]="#8a8a8d"
-theme[available_mid]="#f59e0b"
-theme[available_end]="#b91c1c"
-
-# Mem/Disk used meter
-theme[used_start]="#8a8a8d"
-theme[used_mid]="#f59e0b"
-theme[used_end]="#b91c1c"
-
-# Download graph colors
-theme[download_start]="#8a8a8d"
-theme[download_mid]="#f59e0b"
-theme[download_end]="#b91c1c"
-
-# Upload graph colors
-theme[upload_start]="#8a8a8d"
-theme[upload_mid]="#f59e0b"
-theme[upload_end]="#b91c1c"
diff --git a/themes/matte-black/colors.toml b/themes/matte-black/colors.toml
index f0f1d3a688..1af5cdec86 100644
--- a/themes/matte-black/colors.toml
+++ b/themes/matte-black/colors.toml
@@ -5,19 +5,28 @@ background = "#121212"
 selection_foreground = "#bebebe"
 selection_background = "#333333"
 
-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"
+bg = "#121212"
+lighter_bg = "#1e1e1e"
+selection = "#2a2a2a"
+muted = "#333333"
+dark_fg = "#555555"
+fg = "#777777"
+light_fg = "#8a8a8d"
+bright_fg = "#bebebe"
+
+red = "#D35F5F"
+yellow = "#b91c1c"
+orange = "#c63d3d"
+green = "#FFC107"
+cyan = "#bebebe"
+blue = "#e68e0d"
+purple = "#D35F5F"
+brown = "#631e1e"
+dark_bg = "#0d0d0d"
+darker_bg = "#090909"
+bright_red = "#B91C1C"
+bright_yellow = "#b90a0a"
+bright_green = "#FFC107"
+bright_cyan = "#eaeaea"
+bright_blue = "#f59e0b"
+bright_purple = "#B91C1C"
diff --git a/themes/miasma/btop.theme b/themes/miasma/btop.theme
deleted file mode 100644
index 4db76eb7fa..0000000000
--- a/themes/miasma/btop.theme
+++ /dev/null
@@ -1,70 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#222222"
-
-# Main text color
-theme[main_fg]="#c2c2b0"
-
-# Title color for boxes
-theme[title]="#bb7744"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#c9a554"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#e4c47a"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#000000"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#666666"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#bb7744"
-
-# Box outline and divider line color
-theme[cpu_box]="#5f875f"
-theme[mem_box]="#5f875f"
-theme[net_box]="#5f875f"
-theme[proc_box]="#5f875f"
-theme[div_line]="#666666"
-
-# Gradient for all meters and graphs
-theme[temp_start]="#c9a554"
-theme[temp_mid]="#78824b"
-theme[temp_end]="#5f875f"
-
-
-theme[cpu_start]="#c9a554"
-theme[cpu_mid]="#78824b"
-theme[cpu_end]="#5f875f"
-
-
-theme[free_start]="#78824b"
-theme[free_mid]="#b36d43"
-theme[free_end]="#b36d43"
-
-
-theme[cached_start]="#b36d43"
-theme[cached_mid]="#b36d43"
-theme[cached_end]="#b36d43"
-
-
-theme[available_start]="#c9a554"
-theme[available_mid]="#c9a554"
-theme[available_end]="#c9a554"
-
-
-theme[used_start]="#5f875f"
-theme[used_mid]="#5f875f"
-theme[used_end]="#5f875f"
-
-
-theme[download_start]="#b36d43"
-theme[download_mid]="#c9a554"
-theme[download_end]="#78824b"
-
-
-theme[upload_start]="#b36d43"
-theme[upload_mid]="#c9a554"
-theme[upload_end]="#78824b"
diff --git a/themes/miasma/colors.toml b/themes/miasma/colors.toml
index 705ce2e469..ee921f71ce 100644
--- a/themes/miasma/colors.toml
+++ b/themes/miasma/colors.toml
@@ -5,19 +5,28 @@ background = "#222222"
 selection_foreground = "#c2c2b0"
 selection_background = "#78824b"
 
-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"
+bg = "#222222"
+lighter_bg = "#2c2c2c"
+selection = "#383838"
+muted = "#444444"
+dark_fg = "#555555"
+fg = "#666666"
+light_fg = "#8a8a7e"
+bright_fg = "#c2c2b0"
+
+red = "#685742"
+yellow = "#b36d43"
+orange = "#8d6242"
+green = "#5f875f"
+cyan = "#c9a554"
+blue = "#78824b"
+purple = "#bb7744"
+brown = "#463121"
+dark_bg = "#191919"
+darker_bg = "#121212"
+bright_red = "#685742"
+bright_yellow = "#b36d43"
+bright_green = "#5f875f"
+bright_cyan = "#c9a554"
+bright_blue = "#78824b"
+bright_purple = "#bb7744"
diff --git a/themes/nord/btop.theme b/themes/nord/btop.theme
deleted file mode 100644
index fbd0af143c..0000000000
--- a/themes/nord/btop.theme
+++ /dev/null
@@ -1,89 +0,0 @@
-#Bashtop theme with nord palette (https://www.nordtheme.com)
-#by Justin Zobel <justin.zobel@gmail.com>
-
-# Colors should be in 6 or 2 character hexadecimal or single spaced rgb decimal: "#RRGGBB", "#BW" or "0-255 0-255 0-255"
-# example for white: "#ffffff", "#ff" or "255 255 255".
-
-# All graphs and meters can be gradients
-# For single color graphs leave "mid" and "end" variable empty.
-# Use "start" and "end" variables for two color gradient
-# Use "start", "mid" and "end" for three color gradient
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#2E3440"
-
-# Main text color
-theme[main_fg]="#D8DEE9"
-
-# Title color for boxes
-theme[title]="#8FBCBB"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#5E81AC"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#4C566A"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#ECEFF4"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#4C566A"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#5E81AC"
-
-# Cpu box outline color
-theme[cpu_box]="#4C566A"
-
-# Memory/disks box outline color
-theme[mem_box]="#4C566A"
-
-# Net up/down box outline color
-theme[net_box]="#4C566A"
-
-# Processes box outline color
-theme[proc_box]="#4C566A"
-
-# Box divider line and small boxes line color
-theme[div_line]="#4C566A"
-
-# Temperature graph colors
-theme[temp_start]="#81A1C1"
-theme[temp_mid]="#88C0D0"
-theme[temp_end]="#ECEFF4"
-
-# CPU graph colors
-theme[cpu_start]="#81A1C1"
-theme[cpu_mid]="#88C0D0"
-theme[cpu_end]="#ECEFF4"
-
-# Mem/Disk free meter
-theme[free_start]="#81A1C1"
-theme[free_mid]="#88C0D0"
-theme[free_end]="#ECEFF4"
-
-# Mem/Disk cached meter
-theme[cached_start]="#81A1C1"
-theme[cached_mid]="#88C0D0"
-theme[cached_end]="#ECEFF4"
-
-# Mem/Disk available meter
-theme[available_start]="#81A1C1"
-theme[available_mid]="#88C0D0"
-theme[available_end]="#ECEFF4"
-
-# Mem/Disk used meter
-theme[used_start]="#81A1C1"
-theme[used_mid]="#88C0D0"
-theme[used_end]="#ECEFF4"
-
-# Download graph colors
-theme[download_start]="#81A1C1"
-theme[download_mid]="#88C0D0"
-theme[download_end]="#ECEFF4"
-
-# Upload graph colors
-theme[upload_start]="#81A1C1"
-theme[upload_mid]="#88C0D0"
-theme[upload_end]="#ECEFF4"
diff --git a/themes/nord/colors.toml b/themes/nord/colors.toml
index 79c2ae2361..61e6b63480 100644
--- a/themes/nord/colors.toml
+++ b/themes/nord/colors.toml
@@ -5,19 +5,28 @@ background = "#2e3440"
 selection_foreground = "#d8dee9"
 selection_background = "#4c566a"
 
-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"
+bg = "#2e3440"
+lighter_bg = "#3b4252"
+selection = "#434c5e"
+muted = "#4c566a"
+dark_fg = "#667080"
+fg = "#8690a0"
+light_fg = "#adb5c4"
+bright_fg = "#d8dee9"
+
+red = "#bf616a"
+yellow = "#ebcb8b"
+orange = "#d5967a"
+green = "#a3be8c"
+cyan = "#88c0d0"
+blue = "#81a1c1"
+purple = "#b48ead"
+brown = "#6a4b3d"
+dark_bg = "#222730"
+darker_bg = "#191c23"
+bright_red = "#bf616a"
+bright_yellow = "#ebcb8b"
+bright_green = "#a3be8c"
+bright_cyan = "#8fbcbb"
+bright_blue = "#81a1c1"
+bright_purple = "#b48ead"
diff --git a/themes/osaka-jade/btop.theme b/themes/osaka-jade/btop.theme
deleted file mode 100644
index 8e22ec9a16..0000000000
--- a/themes/osaka-jade/btop.theme
+++ /dev/null
@@ -1,87 +0,0 @@
-# Main background
-theme[main_bg]="#111c18"
-
-# Main text color
-theme[main_fg]="#F7E8B2"
-
-# Title color for boxes
-theme[title]="#D6D5BC"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#E67D64"
-
-# Background color of selected items
-theme[selected_bg]="#364538"
-
-# Foreground color of selected items
-theme[selected_fg]="#DEB266"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#32473B"  
-
-# Color of text appearing on top of graphs
-theme[graph_text]="#E6D8BA"
-
-# Misc colors for processes box
-theme[proc_misc]="#E6D8BA"
-
-# Cpu box outline color
-theme[cpu_box]="#81B8A8"
-
-# Memory/disks box outline color
-theme[mem_box]="#81B8A8"
-
-# Net up/down box outline color
-theme[net_box]="#81B8A8"
-
-# Processes box outline color
-theme[proc_box]="#81B8A8"
-
-# Box divider line and small boxes line color
-theme[div_line]="#81B8A8"
-
-# Temperature graph colors
-theme[temp_start]="#BFD99A"
-theme[temp_mid]="#E1B55E"
-theme[temp_end]="#DBB05C"
-
-# CPU graph colors
-theme[cpu_start]="#5F8C86"
-theme[cpu_mid]="#629C89"
-theme[cpu_end]="#76AD98"
-
-# Mem/Disk free meter
-theme[free_start]="#5F8C86"
-theme[free_mid]="#629C89"
-theme[free_end]="#76AD98"
-
-# Mem/Disk cached meter
-theme[cached_start]="#5F8C86"
-theme[cached_mid]="#629C89"
-theme[cached_end]="#76AD98"
-
-# Mem/Disk available meter
-theme[available_start]="#5F8C86"
-theme[available_mid]="#629C89"
-theme[available_end]="#76AD98"
-
-# Mem/Disk used meter
-theme[used_start]="#5F8C86"
-theme[used_mid]="#629C89"
-theme[used_end]="#76AD98"
-
-# Download graph colors
-theme[download_start]="#75BBB3"
-theme[download_mid]="#61949A"
-theme[download_end]="#215866"
-
-# Upload graph colors
-theme[upload_start]="#215866"
-theme[upload_mid]="#91C080"
-theme[upload_end]="#549E6A"
-
-# Process box color gradient for threads, mem and cpu usage
-theme[process_start]="#72CFA3"
-theme[process_mid]="#D0D494"
-theme[process_end]="#DB9F9C"
-
diff --git a/themes/osaka-jade/colors.toml b/themes/osaka-jade/colors.toml
index 76f763e848..ac313a44e5 100644
--- a/themes/osaka-jade/colors.toml
+++ b/themes/osaka-jade/colors.toml
@@ -5,19 +5,28 @@ background = "#111c18"
 selection_foreground = "#111C18"
 selection_background = "#C1C497"
 
-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"
+bg = "#111c18"
+lighter_bg = "#23372B"
+selection = "#32473B"
+muted = "#53685B"
+dark_fg = "#81B8A8"
+fg = "#C1C497"
+light_fg = "#D6D5BC"
+bright_fg = "#F7E8B2"
+
+red = "#FF5345"
+yellow = "#459451"
+orange = "#a2734b"
+green = "#549e6a"
+cyan = "#2DD5B7"
+blue = "#509475"
+purple = "#D2689C"
+brown = "#513925"
+dark_bg = "#0c1512"
+darker_bg = "#090f0d"
+bright_red = "#db9f9c"
+bright_yellow = "#E5C736"
+bright_green = "#63b07a"
+bright_cyan = "#8CD3CB"
+bright_blue = "#ACD4CF"
+bright_purple = "#75bbb3"
diff --git a/themes/ristretto/btop.theme b/themes/ristretto/btop.theme
deleted file mode 100644
index b058a7fc0c..0000000000
--- a/themes/ristretto/btop.theme
+++ /dev/null
@@ -1,82 +0,0 @@
-#Btop monokai pro ristretto theme
-#Reconfigured from monokai theme
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#2c2421"
-
-# Main text color
-theme[main_fg]="#e6d9db"
-
-# Title color for boxes
-theme[title]="#e6d9db"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#fd6883"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#3d2f2a"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#e6d9db"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#72696a"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#adda78"
-
-# Cpu box outline color
-theme[cpu_box]="#5b4a45"
-
-# Memory/disks box outline color
-theme[mem_box]="#5b4a45"
-
-# Net up/down box outline color
-theme[net_box]="#5b4a45"
-
-# Processes box outline color
-theme[proc_box]="#5b4a45"
-
-# Box divider line and small boxes line color
-theme[div_line]="#72696a"
-
-# Temperature graph colors
-theme[temp_start]="#a8a9eb"
-theme[temp_mid]="#f38d70"
-theme[temp_end]="#fd6a85"
-
-# CPU graph colors
-theme[cpu_start]="#adda78"
-theme[cpu_mid]="#f9cc6c"
-theme[cpu_end]="#fd6883"
-
-# Mem/Disk free meter
-theme[free_start]="#5b4a45"
-theme[free_mid]="#adda78"
-theme[free_end]="#c5e2a3"
-
-# Mem/Disk cached meter
-theme[cached_start]="#5b4a45"
-theme[cached_mid]="#85dacc"
-theme[cached_end]="#b3e8dd"
-
-# Mem/Disk available meter
-theme[available_start]="#5b4a45"
-theme[available_mid]="#f9cc6c"
-theme[available_end]="#fce2a3"
-
-# Mem/Disk used meter
-theme[used_start]="#5b4a45"
-theme[used_mid]="#fd6a85"
-theme[used_end]="#feb5c7"
-
-# Download graph colors
-theme[download_start]="#3d2f2a"
-theme[download_mid]="#a8a9eb"
-theme[download_end]="#c5c6f0"
-
-# Upload graph colors
-theme[upload_start]="#3d2f2a"
-theme[upload_mid]="#fd6a85"
-theme[upload_end]="#feb5c7"
-
diff --git a/themes/ristretto/colors.toml b/themes/ristretto/colors.toml
index b5ca9ab959..b998cf090d 100644
--- a/themes/ristretto/colors.toml
+++ b/themes/ristretto/colors.toml
@@ -5,19 +5,28 @@ background = "#2c2525"
 selection_foreground = "#e6d9db"
 selection_background = "#403e41"
 
-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"
+bg = "#2c2525"
+lighter_bg = "#3d2f2a"
+selection = "#403e41"
+muted = "#5b4a45"
+dark_fg = "#72696a"
+fg = "#948a8b"
+light_fg = "#c3b7b8"
+bright_fg = "#e6d9db"
+
+red = "#fd6883"
+yellow = "#f9cc6c"
+orange = "#fb9a77"
+green = "#adda78"
+cyan = "#85dacc"
+blue = "#f38d70"
+purple = "#a8a9eb"
+brown = "#7d4d3b"
+dark_bg = "#211b1b"
+darker_bg = "#181414"
+bright_red = "#ff8297"
+bright_yellow = "#fcd675"
+bright_green = "#c8e292"
+bright_cyan = "#9bf1e1"
+bright_blue = "#f8a788"
+bright_purple = "#bebffd"
diff --git a/themes/rose-pine/btop.theme b/themes/rose-pine/btop.theme
deleted file mode 100644
index a992faa2a2..0000000000
--- a/themes/rose-pine/btop.theme
+++ /dev/null
@@ -1,119 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#faf4ed"
-# Base
-
-# Main text color
-theme[main_fg]="#575279"
-# Text
-
-# Title color for boxes
-theme[title]="#908caa"
-# Subtle
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#e0def4"
-# Text
-
-# Background color of selected item in processes box
-theme[selected_bg]="#524f67"
-# HL High
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#f6c177"
-# Gold
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#403d52"
-# HL Med
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#9ccfd8"
-# Foam
-
-# Background color of the percentage meters
-theme[meter_bg]="#9ccfd8"
-# Foam
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#c4a7e7"
-# Iris
-
-# Cpu box outline color
-theme[cpu_box]="#ebbcba"
-# Rose
-
-# Memory/disks box outline color
-theme[mem_box]="#31748f"
-# Pine
-
-# Net up/down box outline color
-theme[net_box]="#c4a7e7"
-# Iris
-
-# Processes box outline color
-theme[proc_box]="#eb6f92"
-# Love
-
-# Box divider line and small boxes line color
-theme[div_line]="#6e6a86"
-# Muted
-
-# Temperature graph colors
-theme[temp_start]="#ebbcba"
-# Rose
-theme[temp_mid]="#f6c177"
-# Gold
-theme[temp_end]="#eb6f92"
-# Love
-
-# CPU graph colors
-theme[cpu_start]="#f6c177"
-# Gold
-theme[cpu_mid]="#ebbcba"
-# Rose
-theme[cpu_end]="#eb6f92"
-# Love
-
-# Mem/Disk free meter
-# all love
-theme[free_start]="#eb6f92"
-theme[free_mid]="#eb6f92"
-theme[free_end]="#eb6f92"
-
-# Mem/Disk cached meter
-# all iris
-theme[cached_start]="#c4a7e7"
-theme[cached_mid]="#c4a7e7"
-theme[cached_end]="#c4a7e7"
-
-# Mem/Disk available meter
-# all pine
-theme[available_start]="#31748f"
-theme[available_mid]="#31748f"
-theme[available_end]="#31748f"
-
-# Mem/Disk used meter
-# all rose
-theme[used_start]="#ebbcba"
-theme[used_mid]="#ebbcba"
-theme[used_end]="#ebbcba"
-
-# Download graph colors
-# Pine for start, foam for the rest
-theme[download_start]="#31748f"
-theme[download_mid]="#9ccfd8"
-theme[download_end]="#9ccfd8"
-
-# Upload graph colors
-theme[upload_start]="#ebbcba"
-# Rose for start
-theme[upload_mid]="#eb6f92"
-# Love for mid and end
-theme[upload_end]="#eb6f92"
-
-# Process box color gradient for threads, mem and cpu usage
-theme[process_start]="#31748f"
-# Pine
-theme[process_mid]="#9ccfd8"
-# Foam for mid and end
-theme[process_end]="#9ccfd8"
diff --git a/themes/rose-pine/colors.toml b/themes/rose-pine/colors.toml
index e757ad0398..bb096bd189 100644
--- a/themes/rose-pine/colors.toml
+++ b/themes/rose-pine/colors.toml
@@ -5,19 +5,28 @@ background = "#faf4ed"
 selection_foreground = "#575279"
 selection_background = "#dfdad9"
 
-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"
+bg = "#faf4ed"
+lighter_bg = "#f2e9e1"
+selection = "#dfdad9"
+muted = "#cecacd"
+dark_fg = "#9893a5"
+fg = "#908caa"
+light_fg = "#6e6a86"
+bright_fg = "#575279"
+
+red = "#b4637a"
+yellow = "#ea9d34"
+orange = "#cf8057"
+green = "#286983"
+cyan = "#d7827e"
+blue = "#56949f"
+purple = "#907aa9"
+brown = "#67402b"
+dark_bg = "#ede7e1"
+darker_bg = "#e1dbd5"
+bright_red = "#b4637a"
+bright_yellow = "#ea9d34"
+bright_green = "#286983"
+bright_cyan = "#d7827e"
+bright_blue = "#56949f"
+bright_purple = "#907aa9"
diff --git a/themes/tokyo-night/btop.theme b/themes/tokyo-night/btop.theme
deleted file mode 100644
index 290a3c79d4..0000000000
--- a/themes/tokyo-night/btop.theme
+++ /dev/null
@@ -1,82 +0,0 @@
-# Theme: tokyo-night
-# By: Pascal Jaeger
-
-# Main bg
-theme[main_bg]="#1a1b26"
-
-# Main text color
-theme[main_fg]="#cfc9c2"
-
-# Title color for boxes
-theme[title]="#cfc9c2"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#7dcfff"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#414868"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#cfc9c2"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#565f89"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#7dcfff"
-
-# Cpu box outline color
-theme[cpu_box]="#565f89"
-
-# Memory/disks box outline color
-theme[mem_box]="#565f89"
-
-# Net up/down box outline color
-theme[net_box]="#565f89"
-
-# Processes box outline color
-theme[proc_box]="#565f89"
-
-# Box divider line and small boxes line color
-theme[div_line]="#565f89"
-
-# Temperature graph colors
-theme[temp_start]="#9ece6a"
-theme[temp_mid]="#e0af68"
-theme[temp_end]="#f7768e"
-
-# CPU graph colors
-theme[cpu_start]="#9ece6a"
-theme[cpu_mid]="#e0af68"
-theme[cpu_end]="#f7768e"
-
-# Mem/Disk free meter
-theme[free_start]="#9ece6a"
-theme[free_mid]="#e0af68"
-theme[free_end]="#f7768e"
-
-# Mem/Disk cached meter
-theme[cached_start]="#9ece6a"
-theme[cached_mid]="#e0af68"
-theme[cached_end]="#f7768e"
-
-# Mem/Disk available meter
-theme[available_start]="#9ece6a"
-theme[available_mid]="#e0af68"
-theme[available_end]="#f7768e"
-
-# Mem/Disk used meter
-theme[used_start]="#9ece6a"
-theme[used_mid]="#e0af68"
-theme[used_end]="#f7768e"
-
-# Download graph colors
-theme[download_start]="#9ece6a"
-theme[download_mid]="#e0af68"
-theme[download_end]="#f7768e"
-
-# Upload graph colors
-theme[upload_start]="#9ece6a"
-theme[upload_mid]="#e0af68"
-theme[upload_end]="#f7768e"
-
diff --git a/themes/tokyo-night/colors.toml b/themes/tokyo-night/colors.toml
index fe51dd043f..494204716e 100644
--- a/themes/tokyo-night/colors.toml
+++ b/themes/tokyo-night/colors.toml
@@ -5,19 +5,28 @@ background = "#1a1b26"
 selection_foreground = "#c0caf5"
 selection_background = "#7aa2f7"
 
-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"
+bg = "#1a1b26"
+lighter_bg = "#24283b"
+selection = "#292e42"
+muted = "#414868"
+dark_fg = "#565f89"
+fg = "#737aa2"
+light_fg = "#a9b1d6"
+bright_fg = "#cfc9c2"
+
+red = "#f7768e"
+yellow = "#e0af68"
+orange = "#eb927b"
+green = "#9ece6a"
+cyan = "#449dab"
+blue = "#7aa2f7"
+purple = "#ad8ee6"
+brown = "#75493d"
+dark_bg = "#13141c"
+darker_bg = "#0e0e14"
+bright_red = "#ff7a93"
+bright_yellow = "#ff9e64"
+bright_green = "#b9f27c"
+bright_cyan = "#0db9d7"
+bright_blue = "#7da6ff"
+bright_purple = "#bb9af7"
diff --git a/themes/vantablack/colors.toml b/themes/vantablack/colors.toml
index 96e095fcb6..3acfdc3ace 100644
--- a/themes/vantablack/colors.toml
+++ b/themes/vantablack/colors.toml
@@ -1,31 +1,32 @@
-# UI Colors (extended)
 accent = "#8d8d8d"
 cursor = "#ffffff"
-
-# Primary colors
 foreground = "#ffffff"
 background = "#0d0d0d"
-
-# Selection colors
 selection_foreground = "#0d0d0d"
 selection_background = "#ffffff"
 
-# Normal colors (ANSI 0-7)
-color0 = "#0d0d0d"
-color1 = "#a4a4a4"
-color2 = "#b6b6b6"
-color3 = "#cecece"
-color4 = "#8d8d8d"
-color5 = "#9b9b9b"
-color6 = "#b0b0b0"
-color7 = "#ececec"
+bg = "#0d0d0d"
+lighter_bg = "#1a1a1a"
+selection = "#2e2e2e"
+muted = "#4a4a4a"
+dark_fg = "#6b6b6b"
+fg = "#8d8d8d"
+light_fg = "#b6b6b6"
+bright_fg = "#ffffff"
 
-# Bright colors (ANSI 8-15)
-color8 = "#fdfdfd"
-color9 = "#a4a4a4"
-color10 = "#b6b6b6"
-color11 = "#cecece"
-color12 = "#8d8d8d"
-color13 = "#9b9b9b"
-color14 = "#b0b0b0"
-color15 = "#ffffff"
+red = "#a4a4a4"
+yellow = "#cecece"
+orange = "#b9b9b9"
+green = "#b6b6b6"
+cyan = "#b0b0b0"
+blue = "#8d8d8d"
+purple = "#9b9b9b"
+brown = "#5c5c5c"
+dark_bg = "#090909"
+darker_bg = "#070707"
+bright_red = "#a4a4a4"
+bright_yellow = "#cecece"
+bright_green = "#b6b6b6"
+bright_cyan = "#b0b0b0"
+bright_blue = "#8d8d8d"
+bright_purple = "#9b9b9b"