diff --git a/ghostty.tera b/ghostty.tera
index 18e1eee..5771f5b 100644
--- a/ghostty.tera
+++ b/ghostty.tera
@@ -5,22 +5,9 @@ whiskers:
     - flavor
   filename: "themes/catppuccin-{{ flavor.identifier }}.conf"
 ---
-palette = 0=#{{ if(cond=flavor.dark, t=surface1.hex, f=subtext1.hex) }}
-palette = 1=#{{ red.hex }}
-palette = 2=#{{ green.hex }}
-palette = 3=#{{ yellow.hex }}
-palette = 4=#{{ blue.hex }}
-palette = 5=#{{ pink.hex }}
-palette = 6=#{{ teal.hex }}
-palette = 7=#{{ if(cond=flavor.dark, t=subtext1.hex, f=surface2.hex) }}
-palette = 8=#{{ if(cond=flavor.dark, t=surface2.hex, f=subtext0.hex) }}
-palette = 9=#{{ red.hex }}
-palette = 10=#{{ green.hex }}
-palette = 11=#{{ yellow.hex }}
-palette = 12=#{{ blue.hex }}
-palette = 13=#{{ pink.hex }}
-palette = 14=#{{ teal.hex }}
-palette = 15=#{{ if(cond=flavor.dark, t=subtext0.hex, f=surface1.hex) }}
+{% for _, c in flavor.ansi_colors -%}
+palette = {{ c.code }}=#{{ c.hex }}
+{% endfor -%}
 background = {{ base.hex }}
 foreground = {{ text.hex }}
 cursor-color = {{ rosewater.hex }}
diff --git a/themes/catppuccin-frappe.conf b/themes/catppuccin-frappe.conf
index 51bec4b..92f8545 100644
--- a/themes/catppuccin-frappe.conf
+++ b/themes/catppuccin-frappe.conf
@@ -5,15 +5,15 @@ palette = 3=#e5c890
 palette = 4=#8caaee
 palette = 5=#f4b8e4
 palette = 6=#81c8be
-palette = 7=#b5bfe2
+palette = 7=#a5adce
 palette = 8=#626880
-palette = 9=#e78284
-palette = 10=#a6d189
-palette = 11=#e5c890
-palette = 12=#8caaee
-palette = 13=#f4b8e4
-palette = 14=#81c8be
-palette = 15=#a5adce
+palette = 9=#e67172
+palette = 10=#8ec772
+palette = 11=#d9ba73
+palette = 12=#7b9ef0
+palette = 13=#f2a4db
+palette = 14=#5abfb5
+palette = 15=#b5bfe2
 background = 303446
 foreground = c6d0f5
 cursor-color = f2d5cf
diff --git a/themes/catppuccin-latte.conf b/themes/catppuccin-latte.conf
index 691ae99..40c4ff3 100644
--- a/themes/catppuccin-latte.conf
+++ b/themes/catppuccin-latte.conf
@@ -7,12 +7,12 @@ palette = 5=#ea76cb
 palette = 6=#179299
 palette = 7=#acb0be
 palette = 8=#6c6f85
-palette = 9=#d20f39
-palette = 10=#40a02b
-palette = 11=#df8e1d
-palette = 12=#1e66f5
-palette = 13=#ea76cb
-palette = 14=#179299
+palette = 9=#de293e
+palette = 10=#49af3d
+palette = 11=#eea02d
+palette = 12=#456eff
+palette = 13=#fe85d8
+palette = 14=#2d9fa8
 palette = 15=#bcc0cc
 background = eff1f5
 foreground = 4c4f69
diff --git a/themes/catppuccin-macchiato.conf b/themes/catppuccin-macchiato.conf
index 7f51975..131fbe1 100644
--- a/themes/catppuccin-macchiato.conf
+++ b/themes/catppuccin-macchiato.conf
@@ -5,15 +5,15 @@ palette = 3=#eed49f
 palette = 4=#8aadf4
 palette = 5=#f5bde6
 palette = 6=#8bd5ca
-palette = 7=#b8c0e0
+palette = 7=#a5adcb
 palette = 8=#5b6078
-palette = 9=#ed8796
-palette = 10=#a6da95
-palette = 11=#eed49f
-palette = 12=#8aadf4
-palette = 13=#f5bde6
-palette = 14=#8bd5ca
-palette = 15=#a5adcb
+palette = 9=#ec7486
+palette = 10=#8ccf7f
+palette = 11=#e1c682
+palette = 12=#78a1f6
+palette = 13=#f2a9dd
+palette = 14=#63cbc0
+palette = 15=#b8c0e0
 background = 24273a
 foreground = cad3f5
 cursor-color = f4dbd6
diff --git a/themes/catppuccin-mocha.conf b/themes/catppuccin-mocha.conf
index a4424a2..dc4dc2b 100644
--- a/themes/catppuccin-mocha.conf
+++ b/themes/catppuccin-mocha.conf
@@ -5,15 +5,15 @@ palette = 3=#f9e2af
 palette = 4=#89b4fa
 palette = 5=#f5c2e7
 palette = 6=#94e2d5
-palette = 7=#bac2de
+palette = 7=#a6adc8
 palette = 8=#585b70
-palette = 9=#f38ba8
-palette = 10=#a6e3a1
-palette = 11=#f9e2af
-palette = 12=#89b4fa
-palette = 13=#f5c2e7
-palette = 14=#94e2d5
-palette = 15=#a6adc8
+palette = 9=#f37799
+palette = 10=#89d88b
+palette = 11=#ebd391
+palette = 12=#74a8fc
+palette = 13=#f2aede
+palette = 14=#6bd7ca
+palette = 15=#bac2de
 background = 1e1e2e
 foreground = cdd6f4
 cursor-color = f5e0dc