diff --git a/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml b/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml
index 183b3c8..a405a68 100644
--- a/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml
+++ b/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml
@@ -1,78 +1,94 @@
+color_set:
+    text: &TEXT "#CAD3F5"
+    subtext0: &SUBTEXT0 "#A5ADCB"
+    subtext1: &SUBTEXT1 "#B8C0E0"
+    surface2: &SURFACE2 "#5B6078"
+    surface1: &SURFACE1 "#494D64"
+    base: &BASE "#24273A"
+    red: &RED "#ED8796"
+    green: &GREEN "#A6DA95"
+    blue: &BLUE "#8AADF4"
+    yellow: &YELLOW "#EED49F"
+    pink: &PINK "#F5BDE6"
+    teal: &TEAL "#8BD5CA"
+    rosewater: &ROSEWATER "#F4DBD6"
+    lavender: &LAVENDER "#B7BDF8"
+
 colors:
     # Default colors
     primary:
-        background: "#24273A" # base
-        foreground: "#CAD3F5" # text
+        background: *BASE # base
+        foreground: *TEXT # text
         # Bright and dim foreground colors
-        dim_foreground: "#CAD3F5" # text
-        bright_foreground: "#CAD3F5" # text
+        dim_foreground: *TEXT # text
+        bright_foreground: *TEXT # text
 
     # Cursor colors
     cursor:
-        text: "#24273A" # base
-        cursor: "#F4DBD6" # rosewater
+        text: *BASE # base
+        cursor: *ROSEWATER # rosewater
     vi_mode_cursor:
-        text: "#24273A" # base
-        cursor: "#B7BDF8" # lavender
+        text: *BASE # base
+        cursor: *LAVENDER # lavender
 
     # Search colors
     search:
         matches:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
+            foreground: *BASE # base
+            background: *SUBTEXT0 # subtext0
         focused_match:
-            foreground: "#24273A" # base
-            background: "#A6DA95" # green
+            foreground: *BASE # base
+            background: *GREEN # green
         footer_bar:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
+            foreground: *BASE # base
+            background: *SUBTEXT0 # subtext0
 
     # Keyboard regex hints
     hints:
         start:
-            foreground: "#24273A" # base
-            background: "#EED49F" # yellow
+            foreground: *BASE # base
+            background: *YELLOW # yellow
         end:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
+            foreground: *BASE # base
+            background: *SUBTEXT0 # subtext0
 
     # Selection colors
     selection:
-        text: "#24273A" # base
-        background: "#F4DBD6" # rosewater
+        text: *BASE # base
+        background: *ROSEWATER # rosewater
 
     # Normal colors
     normal:
-        black: "#494D64" # surface1
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#B8C0E0" # subtext1
+        black: *SURFACE1 # surface1
+        red: *RED # red
+        green: *GREEN # green
+        yellow: *YELLOW # yellow
+        blue: *BLUE # blue
+        magenta: *PINK # pink
+        cyan: *TEAL # teal
+        white: *SUBTEXT1 # subtext1
 
     # Bright colors
     bright:
-        black: "#5B6078" # surface2
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#A5ADCB" # subtext0
+        black: *SURFACE2 # surface2
+        red: *RED # red
+        green: *GREEN # green
+        yellow: *YELLOW # yellow
+        blue: *BLUE # blue
+        magenta: *PINK # pink
+        cyan: *TEAL # teal
+        white: *SUBTEXT0 # subtext0
 
     # Dim colors
     dim:
-        black: "#494D64" # surface1
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#B8C0E0" # subtext1
+        black: *SURFACE1 # surface1
+        red: *RED # red
+        green: *GREEN # green
+        yellow: *YELLOW # yellow
+        blue: *BLUE # blue
+        magenta: *PINK # pink
+        cyan: *TEAL # teal
+        white: *SUBTEXT1 # subtext1
 
     indexed_colors:
         - { index: 16, color: "#F5A97F" }