update colorschemes

20 files changed, 222 insertions, 191 deletions

diff --git a/home/neovim/config.nix b/home/neovim/config.nix
index be74ddc..98895ed 100644
--- a/home/neovim/config.nix
+++ b/home/neovim/config.nix
@@ -86,22 +86,22 @@ in
     # colorscheme
     theme = {
       colors = {
-        base00 = "#${config.theme.colors.bg}";
-        base01 = "#${config.theme.colors.surface.bg}";
-        base02 = "#${config.theme.colors.surface.bg}";
-        base03 = "#${config.theme.colors.bright.white}";
-        base04 = "#${config.theme.colors.bright.black}";
-        base05 = "#${config.theme.colors.fg}";
-        base06 = "#${config.theme.colors.bright.white}";
-        base07 = "#${config.theme.colors.hover.bg}";
+        base00 = "#${config.theme.colors.base}";
+        base01 = "#${config.theme.colors.surface}";
+        base02 = "#${config.theme.colors.surface}";
+        base03 = "#${config.theme.colors.overlay}";
+        base04 = "#${config.theme.colors.subtext}";
+        base05 = "#${config.theme.colors.text}";
+        base06 = "#${config.theme.colors.text}";
+        base07 = "#${config.theme.colors.overlay}";
         base08 = "#${config.theme.colors.bright.red}";
-        base09 = "#${config.theme.colors.bright.yellow}";
+        base09 = "#${config.theme.colors.bright.orange}";
         base0A = "#${config.theme.colors.bright.yellow}";
         base0B = "#${config.theme.colors.bright.green}";
         base0C = "#${config.theme.colors.bright.cyan}";
         base0D = "#${config.theme.colors.bright.blue}";
         base0E = "#${config.theme.colors.bright.magenta}";
-        base0F = "#${config.theme.colors.normal.yellow}";
+        base0F = "#${config.theme.colors.bright.pink}";
       };
       transparent = true;
     };
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index 13a1926..3b04a8c 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -10,10 +10,10 @@
   hyprland-plugins = inputs.hyprland-plugins.packages.${system};
   hy3 = inputs.hy3.packages.${system};
 
-  fg = "rgb(${config.theme.colors.fg})";
-  bg = "rgb(${config.theme.colors.bg})";
+  text = "rgb(${config.theme.colors.text})";
+  base = "rgb(${config.theme.colors.base})";
+  surface = "rgb(${config.theme.colors.surface})";
   primary = "rgb(${config.theme.colors.primary})";
-  inactive = "rgb(${config.theme.colors.surface.bg})";
 
   debug = false;
 
@@ -103,7 +103,7 @@ in {
             extend_border_grab_area = 20;
             border_size = config.theme.borderWidth;
             "col.active_border" = "${primary}";
-            "col.inactive_border" = "${inactive}";
+            "col.inactive_border" = "${surface}";
           };
 
           # Gestures
@@ -304,12 +304,12 @@ in {
                 radius = config.theme.outerRadius;
                 border_width = config.theme.borderWidth;
 
-                "col.active" = "${bg}";
-                "col.active.border" = "${inactive}";
-                "col.active.text" = "${fg}";
-                "col.inactive" = "${bg}";
-                "col.inactive.border" = "${inactive}";
-                "col.inactive.text" = "${fg}";
+                "col.active" = "${base}";
+                "col.active.border" = "${primary}";
+                "col.active.text" = "${text}";
+                "col.inactive" = "${base}";
+                "col.inactive.border" = "${surface}";
+                "col.inactive.text" = "${text}";
               };
 
               autotile = {
diff --git a/modules/desktop/hyprlock.nix b/modules/desktop/hyprlock.nix
index da0621c..8be2856 100644
--- a/modules/desktop/hyprlock.nix
+++ b/modules/desktop/hyprlock.nix
@@ -3,8 +3,8 @@
   lib,
   ...
 }: let
-  fg = "rgb(${config.theme.colors.fg})";
-  bg = "rgb(${config.theme.colors.bg})";
+  text = "rgb(${config.theme.colors.text})";
+  base = "rgb(${config.theme.colors.base})";
   error = "rgb(${config.theme.colors.error})";
   trans = "rgba(0,0,0,0)";
 
@@ -21,7 +21,7 @@ in {
         settings = {
           background = {
             path = config.theme.lockscreen;
-            color = bg;
+            color = base;
             blur_passes = 0;
             blur_size = 2;
             noise = 0;
@@ -41,7 +41,7 @@ in {
             dots_rounding = -1;
             outer_color = trans;
             inner_color = trans;
-            font_color = fg;
+            font_color = text;
             fade_on_empty = false;
             placeholder_text = "Enter Password";
             hide_input = false;
@@ -62,7 +62,7 @@ in {
             # Date
             {
               text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\"";
-              color = fg;
+              color = text;
               font_size = 20;
               font_family = config.theme.font.header;
               position = "0, -100";
@@ -72,7 +72,7 @@ in {
             # Clock
             {
               text = "cmd[update:1000] echo \"$(date +\"%k:%M:%S\")\"";
-              color = fg;
+              color = text;
               font_size = 90;
               font_family = config.theme.font.header;
               position = "0, -130";
diff --git a/modules/desktop/mako.nix b/modules/desktop/mako.nix
index 17ed94f..5a24e56 100644
--- a/modules/desktop/mako.nix
+++ b/modules/desktop/mako.nix
@@ -17,11 +17,11 @@ in {
           margin = toString config.theme.outerGap;
           padding = toString config.theme.innerGap;
 
-          background-color = "#${config.theme.colors.bg}";
+          background-color = "#${config.theme.colors.base}";
           progress-color = "#${config.theme.colors.primary}";
-          text-color = "#${config.theme.colors.fg}";
+          text-color = "#${config.theme.colors.text}";
 
-          border-color = "#${config.theme.colors.fg}";
+          border-color = "#${config.theme.colors.text}";
           border-size = config.theme.borderWidth;
           border-radius = config.theme.outerRadius;
 
diff --git a/modules/desktop/waybar/style.nix b/modules/desktop/waybar/style.nix
index 33db673..21a8de5 100644
--- a/modules/desktop/waybar/style.nix
+++ b/modules/desktop/waybar/style.nix
@@ -1,8 +1,7 @@
 {theme}: let
-  fg = "#${theme.colors.fg}";
-  bg = "#${theme.colors.bg}";
-  surface-fg = "#${theme.colors.surface.fg}";
-  surface-bg = "#${theme.colors.surface.bg}";
+  text = "#${theme.colors.text}";
+  base = "#${theme.colors.base}";
+  surface = "#${theme.colors.surface}";
   primary = "#${theme.colors.primary}";
   success = "#${theme.colors.success}";
   warning = "#${theme.colors.warning}";
@@ -23,8 +22,8 @@ in ''
   window#waybar {
       font-family: "${theme.font.regular}", "${theme.font.icon}", "${theme.font.monospace}";
       font-size: ${fontSize};
-      color: ${fg};
-      background-color: ${bg};
+      color: ${text};
+      background-color: ${base};
   }
 
   /** Workspaces */
@@ -37,14 +36,14 @@ in ''
       border-radius: ${innerRadius};
       margin: 4px 2px;
       padding: 0px 7px;
-      background: ${surface-bg};
-      color: ${surface-fg};
+      background: ${surface};
+      color: ${text};
   }
 
   #workspaces button.focused,
   #workspaces button.active {
       background: ${primary};
-      color: ${bg};
+      color: ${base};
   }
 
   #workspaces button.urgent {
diff --git a/modules/desktop/wofi/style.nix b/modules/desktop/wofi/style.nix
index 27b7205..75a0a21 100644
--- a/modules/desktop/wofi/style.nix
+++ b/modules/desktop/wofi/style.nix
@@ -1,8 +1,7 @@
 {theme}: let
-  fg = "#${theme.colors.fg}";
-  bg = "#${theme.colors.bg}";
-  surface-fg = "#${theme.colors.surface.fg}";
-  surface-bg = "#${theme.colors.surface.bg}";
+  text = "#${theme.colors.text}";
+  base = "#${theme.colors.base}";
+  surface = "#${theme.colors.surface}";
   primary = "#${theme.colors.primary}";
   fontSize = "${toString theme.font.size}px";
   outerGap = "${toString theme.outerGap}px";
@@ -21,7 +20,7 @@ in ''
      margin: 0px;
      border: ${borderWidth} solid ${primary};
      border-radius: ${outerRadius};
-     background-color: ${bg};
+     background-color: ${base};
   }
 
   /* Outer Box */
@@ -41,8 +40,8 @@ in ''
     margin: ${innerGap};
     padding: ${innerGap};
     border: none;
-    color: ${surface-fg};
-    background-color: ${surface-bg};
+    color: ${text};
+    background-color: ${surface};
     border-radius: ${outerRadius};
   }
 
@@ -58,7 +57,7 @@ in ''
      margin: ${innerGap};
      padding: ${innerGap};
      border: none;
-     color: ${fg};
+     color: ${text};
   }
 
   /* Selected Entry */
@@ -68,7 +67,7 @@ in ''
   }
 
   #entry:selected #text {
-     color: ${bg};
+     color: ${base};
   }
 
 ''
diff --git a/modules/options.nix b/modules/options.nix
index 62b4ae5..78b7776 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -41,36 +41,29 @@ with lib; let
         description = "Author of the theme";
       };
 
-      fg = mkOption {
+      text = mkOption {
         type = types.str;
-        description = "Text color";
+        description = "Text color.";
       };
 
-      bg = mkOption {
+      subtext = mkOption {
         type = types.str;
-        description = "Background color";
+        description = "Subtext color.";
       };
 
-      surface = {
-        fg = mkOption {
-          type = types.str;
-          description = "Surface text color";
-        };
-        bg = mkOption {
-          type = types.str;
-          description = "Surface background color";
-        };
+      base = mkOption {
+        type = types.str;
+        description = "Base background color.";
       };
 
-      hover = {
-        fg = mkOption {
-          type = types.str;
-          description = "Hover text color";
-        };
-        bg = mkOption {
-          type = types.str;
-          description = "Hover background color";
-        };
+      surface = mkOption {
+        type = types.str;
+        description = "Surface (lighter) background color.";
+      };
+
+      overlay = mkOption {
+        type = types.str;
+        description = "Overlay (light) background color.";
       };
 
       primary = mkOption {
@@ -96,84 +89,104 @@ with lib; let
       normal = {
         black = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal black normal color";
         };
 
-        blue = mkOption {
+        red = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal red normal color";
         };
 
-        cyan = mkOption {
+        green = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal green normal color";
         };
 
-        green = mkOption {
+        yellow = mkOption {
+          type = types.str;
+          description = "Terminal yellow normal color";
+        };
+
+        blue = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal blue normal color";
         };
 
         magenta = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal magenta normal color";
         };
 
-        red = mkOption {
+        cyan = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal cyan normal color";
         };
 
         white = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal white normal color";
         };
 
-        yellow = mkOption {
+        pink = mkOption {
+          type = types.str;
+          description = "Terminal pink (extended) normal color.";
+        };
+
+        orange = mkOption {
           type = types.str;
-          description = "Terminal normal color";
+          description = "Terminal orange (extended) normal color.";
         };
       };
 
       bright = {
         black = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal black bright color";
         };
 
-        blue = mkOption {
+        red = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal red bright color";
         };
 
-        cyan = mkOption {
+        green = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal green bright color";
         };
 
-        green = mkOption {
+        yellow = mkOption {
+          type = types.str;
+          description = "Terminal yellow bright color";
+        };
+
+        blue = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal blue bright color";
         };
 
         magenta = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal magenta bright color";
         };
 
-        red = mkOption {
+        cyan = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal cyan bright color";
         };
 
         white = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal white bright color";
         };
 
-        yellow = mkOption {
+        pink = mkOption {
+          type = types.str;
+          description = "Terminal pink (extended) bright color.";
+        };
+
+        orange = mkOption {
           type = types.str;
-          description = "Terminal bright color";
+          description = "Terminal orange (extended) bright color.";
         };
       };
     };
diff --git a/modules/terminal/alacritty.nix b/modules/terminal/alacritty.nix
index 7dd4456..7addff0 100644
--- a/modules/terminal/alacritty.nix
+++ b/modules/terminal/alacritty.nix
@@ -48,25 +48,46 @@ in {
           };
 
           # Colors
-          colors =
-            (lib.attrsets.mapAttrs (
-              group: colors:
-                lib.attrsets.mapAttrs (name: color: "#${color}") colors
-            ) {inherit (config.theme.colors) bright normal;})
-            // {
-              cursor = {
-                background = "CellForeground";
-                text = "CellBackground";
-              };
-              selection = {
-                background = "CellForeground";
-                text = "CellBackground";
-              };
-              primary = {
-                foreground = "#${config.theme.colors.fg}";
-                background = "#${config.theme.colors.bg}";
-              };
+          colors = {
+            normal = lib.attrsets.mapAttrs (name: color: "${color}") {
+              inherit (config.theme.colors.normal)
+                black
+                red
+                green
+                yellow
+                blue
+                magenta
+                cyan
+                white;
             };
+
+            bright = lib.attrsets.mapAttrs (name: color: "${color}") {
+              inherit (config.theme.colors.bright)
+                black
+                red
+                green
+                yellow
+                blue
+                magenta
+                cyan
+                white;
+            };
+
+            cursor = {
+              background = "CellForeground";
+              text = "CellBackground";
+            };
+
+            selection = {
+              background = "CellForeground";
+              text = "CellBackground";
+            };
+
+            primary = {
+              foreground = "#${config.theme.colors.text}";
+              background = "#${config.theme.colors.base}";
+            };
+          };
         };
       };
     };
diff --git a/modules/terminal/kitty.nix b/modules/terminal/kitty.nix
index 88aa151..cee0e72 100644
--- a/modules/terminal/kitty.nix
+++ b/modules/terminal/kitty.nix
@@ -43,20 +43,17 @@ in {
           # Disable close prompt
           confirm_os_window_close = 0;
 
-          # colors
-          background = "#${config.theme.colors.bg}";
-          foreground = "#${config.theme.colors.fg}";
-          selection_background = "#${config.theme.colors.surface.bg}";
-          selection_foreground = "#${config.theme.colors.surface.fg}";
+          # selection
+          selection_background = "#${config.theme.colors.surface}";
+          selection_foreground = "none";
+
+          # cursor
           url_color = "#${config.theme.colors.bright.yellow}";
-          cursor = "#${config.theme.colors.fg}";
-          active_border_color = "#${config.theme.colors.primary}";
-          inactive_border_color = "#${config.theme.colors.bg}";
-          active_tab_background = "#${config.theme.colors.bg}";
-          active_tab_foreground = "#${config.theme.colors.fg}";
-          inactive_tab_background = "#${config.theme.colors.bg}";
-          inactive_tab_foreground = "#${config.theme.colors.fg}";
-          tab_bar_background = "#${config.theme.colors.bg}";
+          cursor = "#${config.theme.colors.text}";
+
+          # colors
+          background = "#${config.theme.colors.base}";
+          foreground = "#${config.theme.colors.text}";
 
           # normal
           color0 = "#${config.theme.colors.normal.black}";
diff --git a/pkgs/astal/src/style/style.scss b/pkgs/astal/src/style/style.scss
index ddef6c7..3812245 100644
--- a/pkgs/astal/src/style/style.scss
+++ b/pkgs/astal/src/style/style.scss
@@ -13,47 +13,47 @@
 }
 
 window {
-    color: $fg;
+    color: $text;
     font-family: $font-name;
 }
 
 button {
-    color: $fg;
-    background: $surface-bg;
+    color: $text;
+    background: $surface;
 
     &:hover {
-        background: $hover-bg;
+        background: $overlay;
     }
 
     &.primary {
-        color: $bg;
+        color: $base;
         background: $primary;
     }
 }
 
 menu {
-    background: $bg;
+    background: $base;
     padding: $inner-gap 0;
     border-radius: $outer-radius;
 
     menuitem {
-        color: $fg;
+        color: $text;
         margin: $inner-gap $outer-gap;
         padding: $inner-gap;
         border-radius: $inner-radius;
 
         &:hover,
         &:selected {
-            background: $surface-bg;
+            background: $surface;
         }
 
         &:disabled {
-            color: darken($fg, 5%);
+            color: darken($text, 5%);
         }
     }
 
     separator {
-        background-color: $surface-bg;
+        background-color: $surface;
         min-height: 1px;
         margin: $inner-gap 0;
     }
diff --git a/pkgs/astal/src/style/widget/bar.scss b/pkgs/astal/src/style/widget/bar.scss
index 01e73ce..69ab270 100644
--- a/pkgs/astal/src/style/widget/bar.scss
+++ b/pkgs/astal/src/style/widget/bar.scss
@@ -1,6 +1,6 @@
 
 .bar {
-  background: $bg;
+  background: $base;
 
   .workspaces {
     margin: $inner-gap $outer-gap;
@@ -23,7 +23,7 @@
     .tray {
       margin: $inner-gap $outer-gap;
       margin-right: 0px;
-      background: $surface-bg;
+      background: $surface;
       border-radius: $inner-radius;
       padding: 0px $outer-gap;
 
diff --git a/pkgs/astal/src/style/widget/corners.scss b/pkgs/astal/src/style/widget/corners.scss
index 53cdb9b..a5015cb 100644
--- a/pkgs/astal/src/style/widget/corners.scss
+++ b/pkgs/astal/src/style/widget/corners.scss
@@ -3,7 +3,7 @@
   $radius: $outer-radius + $outer-gap;
 
   box {
-    box-shadow: 0 0 0 $radius $bg;
+    box-shadow: 0 0 0 $radius $base;
     border-radius: $radius $radius 0 0;
   }
 }
diff --git a/pkgs/astal/src/style/widget/deck.scss b/pkgs/astal/src/style/widget/deck.scss
index adf8c00..64cfc9d 100644
--- a/pkgs/astal/src/style/widget/deck.scss
+++ b/pkgs/astal/src/style/widget/deck.scss
@@ -9,8 +9,8 @@ $deck-scale: $font-size * 4;
 
     .notification {
         > box {
-            color: $fg;
-            background: $bg;
+            color: $text;
+            background: $base;
             border-radius: $outer-radius;
             margin-bottom: $outer-gap;
             min-width: $deck-scale * 6;
@@ -33,7 +33,7 @@ $deck-scale: $font-size * 4;
 
     .header {
         padding: $outer-gap;
-        color: gtkalpha($fg, 0.5);
+        color: gtkalpha($text, 0.5);
 
         .app-icon {
             margin-left: $inner-gap;
@@ -63,14 +63,14 @@ $deck-scale: $font-size * 4;
 
     separator {
         margin: 0 $outer-gap;
-        background: gtkalpha($fg, .1);
+        background: gtkalpha($text, .1);
     }
 
     .content {
         margin: $outer-gap;
 
         .body {
-            color: gtkalpha($fg, 0.8);
+            color: gtkalpha($text, 0.8);
         }
 
         .image {
diff --git a/pkgs/astal/src/style/widget/launcher.scss b/pkgs/astal/src/style/widget/launcher.scss
index 3b05aca..d39f06f 100644
--- a/pkgs/astal/src/style/widget/launcher.scss
+++ b/pkgs/astal/src/style/widget/launcher.scss
@@ -2,14 +2,14 @@
 .launcher {
 	> box {
 		padding: 5em;
-		background: gtkalpha($bg, 0.7);
+		background: gtkalpha($base, 0.7);
 		border-radius: $outer-radius $outer-radius 0 0;
 	}
 
 	.search {
 		margin-bottom: 5em;
-		color: $surface-fg;
-		background: $surface-bg;
+		color: $text;
+		background: $surface;
 		padding: $outer-gap;
 		border-radius: $outer-radius;
 		min-width: 20em;
@@ -25,7 +25,7 @@
 
 		&:hover,
 		&.selected {
-			background: gtkalpha($hover-bg, .5);
+			background: gtkalpha($overlay, .5);
 		}
 
 		icon {
@@ -35,7 +35,7 @@
 		.name {
 			margin-top: $outer-gap;
 			font-size: 1.25em;
-			color: gtkalpha($fg, 0.9);
+			color: gtkalpha($text, 0.9);
 		}
 	}
 
diff --git a/pkgs/astal/theme.nix b/pkgs/astal/theme.nix
index 2802d6c..9774012 100644
--- a/pkgs/astal/theme.nix
+++ b/pkgs/astal/theme.nix
@@ -1,13 +1,11 @@
 {options, ...}: ''
 
-  $fg: #${options.theme.colors.fg};
-  $bg: #${options.theme.colors.bg};
+  $text: #${options.theme.colors.text};
+  $subtext: #${options.theme.colors.subtext};
 
-  $surface-fg: #${options.theme.colors.surface.fg};
-  $surface-bg: #${options.theme.colors.surface.bg};
-
-  $hover-fg: #${options.theme.colors.hover.fg};
-  $hover-bg: #${options.theme.colors.hover.bg};
+  $base: #${options.theme.colors.base};
+  $surface: #${options.theme.colors.surface};
+  $overlay: #${options.theme.colors.overlay};
 
   $primary: #${options.theme.colors.primary};
   $success: #${options.theme.colors.success};
diff --git a/themes/catppuccin/frappe.nix b/themes/catppuccin/frappe.nix
index 9b2c006..5312418 100644
--- a/themes/catppuccin/frappe.nix
+++ b/themes/catppuccin/frappe.nix
@@ -2,14 +2,12 @@ rec {
   name = "Catppuccin Frappe";
   author = "https://github.com/catppuccin/catppuccin";
 
-  fg = "c6d0f5";
-  bg = "303446";
+  text = "c6d0f5";
+  subtext = "b5bfe2";
 
-  surface.fg = fg;
-  surface.bg = "414559";
-
-  hover.fg = fg;
-  hover.bg = "737994";
+  base = "303446";
+  surface = "414559";
+  overlay = "737994";
 
   primary = normal.blue;
   success = normal.green;
@@ -25,6 +23,7 @@ rec {
     magenta = "f4b8e4";
     cyan = "81c8be";
     white = "b5bfe2";
+    orange = "ef9f76";
   };
 
   bright = {
@@ -36,5 +35,6 @@ rec {
     magenta = "f4b8e4";
     cyan = "81c8be";
     white = "a5adce";
+    orange = "ef9f76";
   };
 }
diff --git a/themes/catppuccin/latte.nix b/themes/catppuccin/latte.nix
index 0378da8..0ac5185 100644
--- a/themes/catppuccin/latte.nix
+++ b/themes/catppuccin/latte.nix
@@ -2,14 +2,12 @@ rec {
   name = "Catppuccin Latte";
   author = "https://github.com/catppuccin/catppuccin";
 
-  fg = "4c4f69";
-  bg = "eff1f5";
+  text = "4c4f69";
+  subtext = "5c5f77";
 
-  surface.fg = fg;
-  surface.bg = "ccd0da";
-
-  hover.fg = fg;
-  hover.bg = "9ca0b0";
+  base = "eff1f5";
+  surface = "ccd0da";
+  overlay = "9ca0b0";
 
   primary = normal.blue;
   success = normal.green;
@@ -25,6 +23,7 @@ rec {
     magenta = "ea76cb";
     cyan = "179299";
     white = "5c5f77";
+    orange = "fe640b";
   };
 
   bright = {
@@ -36,5 +35,6 @@ rec {
     magenta = "ea76cb";
     cyan = "179299";
     white = "6c6f85";
+    orange = "fe640b";
   };
 }
diff --git a/themes/catppuccin/macchiato.nix b/themes/catppuccin/macchiato.nix
index 46f17b5..f90a6da 100644
--- a/themes/catppuccin/macchiato.nix
+++ b/themes/catppuccin/macchiato.nix
@@ -2,14 +2,12 @@ rec {
   name = "Catppuccin Macchiato";
   author = "https://github.com/catppuccin/catppuccin";
 
-  fg = "cad3f5";
-  bg = "1e1e2e";
+  text = "cad3f5";
+  subtext = "b8c0e0";
 
-  surface.fg = fg;
-  surface.bg = "313244";
-
-  hover.fg = fg;
-  hover.bg = "24273a";
+  base = "24273a";
+  surface = "363a4f";
+  overlay = "6e738d";
 
   primary = normal.blue;
   success = normal.green;
@@ -25,6 +23,7 @@ rec {
     magenta = "f5bde6";
     cyan = "8bd5ca";
     white = "b8c0e0";
+    orange = "f5a97f";
   };
 
   bright = {
@@ -36,5 +35,6 @@ rec {
     magenta = "f5bde6";
     cyan = "8bd5ca";
     white = "a5adcb";
+    orange = "f5a97f";
   };
 }
diff --git a/themes/catppuccin/mocha.nix b/themes/catppuccin/mocha.nix
index 3115d00..2abcebb 100644
--- a/themes/catppuccin/mocha.nix
+++ b/themes/catppuccin/mocha.nix
@@ -2,14 +2,12 @@ rec {
   name = "Catppuccin Mocha";
   author = "https://github.com/catppuccin/catppuccin";
 
-  fg = "cdd6f4";
-  bg = "1e1e2e";
+  text = "cdd6f4";
+  subtext = "bac2de";
 
-  surface.fg = fg;
-  surface.bg = "313244";
-
-  hover.fg = fg;
-  hover.bg = "6c7086";
+  base = "1e1e2e";
+  surface = "313244";
+  overlay = "6c7086";
 
   primary = normal.blue;
   success = normal.green;
@@ -25,6 +23,8 @@ rec {
     magenta = "ca9ee6";
     cyan = "94e2d5";
     white = "bac2de";
+    pink = "f5c2e7";
+    orange = "fab387";
   };
 
   bright = {
@@ -36,5 +36,7 @@ rec {
     magenta = "ca9ee6";
     cyan = "94e2d5";
     white = "a6adc8";
+    pink = "f5c2e7";
+    orange = "fab387";
   };
 }
diff --git a/themes/tricolors.nix b/themes/tricolors.nix
index 286994e..4f8f551 100644
--- a/themes/tricolors.nix
+++ b/themes/tricolors.nix
@@ -2,14 +2,12 @@ rec {
   name = "tricolors";
   author = "https://trimill.xyz";
 
-  fg = bright.white;
-  bg = normal.black;
+  text = bright.white;
+  subtext = normal.white;
 
-  surface.fg = fg;
-  surface.bg = "2c2b3b";
-
-  hover.fg = fg;
-  hover.bg = bright.black;
+  base = normal.black;
+  surface = "2c2b3b";
+  overlay = bright.black;
 
   primary = bright.blue;
   success = bright.green;
@@ -25,6 +23,8 @@ rec {
     red = "a63a3a";
     white = "ada0a8";
     yellow = "de7e54";
+    pink = normal.magenta;
+    orange = normal.yellow;
   };
 
   bright = {
@@ -36,5 +36,7 @@ rec {
     red = "cc5c5c";
     white = "c7c6c3";
     yellow = "f0c767";
+    pink = bright.magenta;
+    orange = bright.yellow;
   };
 }