1 files changed, 36 insertions, 17 deletions
diff --git a/nix/themes/catppuccin/macchiato.nix b/nix/themes/catppuccin/macchiato.nix
index 1f401be..e069a93 100644
--- a/nix/themes/catppuccin/macchiato.nix
+++ b/nix/themes/catppuccin/macchiato.nix
@@ -1,21 +1,40 @@
-{
+rec {
 	name = "Catppuccin Macchiato";
 	author = "https://github.com/catppuccin/catppuccin";
 
-	base00 = "24273a"; # base
-	base01 = "1e2030"; # mantle
-	base02 = "363a4f"; # surface0
-	base03 = "494d64"; # surface1
-	base04 = "5b6078"; # surface2
-	base05 = "cad3f5"; # text
-	base06 = "f4dbd6"; # rosewater
-	base07 = "b7bdf8"; # lavender
-	base08 = "ed8796"; # red
-	base09 = "f5a97f"; # peach
-	base0A = "eed49f"; # yellow
-	base0B = "a6da95"; # green
-	base0C = "8bd5ca"; # teal
-	base0D = "8aadf4"; # blue
-	base0E = "c6a0f6"; # mauve
-	base0F = "f0c6c6"; # flamingo
+	fg = "cad3f5";
+	bg = "1e1e2e";
+
+	surface.fg = fg;
+	surface.bg = "313244";
+
+	hover.fg = fg;
+	hover.bg = "24273a";
+
+	primary = normal.blue;
+	success = normal.green;
+	warning = normal.yellow;
+	error = normal.red;
+
+	normal = {
+		black = "494d64";
+		red = "ed8796";
+		green = "a6da95";
+		yellow = "eed49f";
+		blue = "8aadf4";
+		magenta = "f5bde6";
+		cyan = "8bd5ca";
+		white = "b8c0e0";
+	};
+
+	bright = {
+		black = "5b6078";
+		red = "ed8796";
+		green = "a6da95";
+		yellow = "eed49f";
+		blue = "8aadf4";
+		magenta = "f5bde6";
+		cyan = "8bd5ca";
+		white = "a5adcb";
+	};
 }