diff --git a/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml b/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml
index 183b3c8..a68f0e9 100644
--- a/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml
+++ b/etc/skel/.config/alacritty/theme/catppuccin-macchiato.yml
@@ -1,78 +1,96 @@
+color_set:
+    text: &TEXT "#CAD3F5"
+    subtext0: &SUBTEXT0 "#E3E3F3"
+    subtext1: &SUBTEXT1 "#CED4E0"
+    surface2: &SURFACE2 "#5B6078"
+    surface1: &SURFACE1 "#494D64"
+    index16: &INDEX16 "#F5A97F"
+    index17: &INDEX17 "#F4DBD6"
+    base: &BASE "#24273A"
+    red: &RED "#ED6070"
+    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" }
diff --git a/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml b/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml
index e2b840e..826a71a 100644
--- a/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml
+++ b/etc/skel/.config/pluma/styles/catppuccin-macchiato.xml
@@ -13,7 +13,7 @@ Catppuccin Gedit theme based on Oblivion theme and Cappuccin for Visual Studio C
 <color name="macchiato_flamingo"  value="#f0c6c6"/>
 <color name="macchiato_pink"      value="#f5bde6"/>
 <color name="macchiato_mauve"     value="#c6a0f6"/>
-<color name="macchiato_red"       value="#ed8796"/>
+<color name="macchiato_red"       value="#ed6070"/>
 <color name="macchiato_maroon"    value="#ee99a0"/>
 <color name="macchiato_peach"     value="#f5a97f"/>
 <color name="macchiato_yellow"    value="#eed49f"/>
@@ -24,8 +24,8 @@ Catppuccin Gedit theme based on Oblivion theme and Cappuccin for Visual Studio C
 <color name="macchiato_blue"      value="#8aadf4"/>
 <color name="macchiato_lavender"  value="#b7bdf8"/>
 <color name="macchiato_text"      value="#cad3f5"/>
-<color name="macchiato_subtext1"  value="#b8c0e0"/>
-<color name="macchiato_subtext0"  value="#a5adcb"/>
+<color name="macchiato_subtext1"  value="#ced4e0"/>
+<color name="macchiato_subtext0"  value="#e3e3f3"/>
 <color name="macchiato_overlay2"  value="#939ab7"/>
 <color name="macchiato_overlay1"  value="#8087a2"/>
 <color name="macchiato_overlay0"  value="#6e738d"/>
diff --git a/usr/lib/systemd/user/swayidle-restart.path b/usr/lib/systemd/user/swayidle-restart.path
new file mode 100644
index 0000000..356a3ec
--- /dev/null
+++ b/usr/lib/systemd/user/swayidle-restart.path
@@ -0,0 +1,10 @@
+[Unit]
+Description=Automatically restart the swayidle when its configuration changes
+PartOf=swayidle.service
+After=swayidle.service
+
+[Path]
+PathChanged=%h/.config/swayidle/config
+
+[Install]
+WantedBy=river-session.target
diff --git a/usr/lib/systemd/user/swayidle-restart.service b/usr/lib/systemd/user/swayidle-restart.service
new file mode 100644
index 0000000..839bb44
--- /dev/null
+++ b/usr/lib/systemd/user/swayidle-restart.service
@@ -0,0 +1,6 @@
+[Service]
+ExecStart=systemctl --user restart swayidle.service
+Type=oneshot
+
+[Install]
+WantedBy=graphical-session.target
diff --git a/usr/lib/systemd/user/swayidle.service b/usr/lib/systemd/user/swayidle.service
index 4d6a4c0..fe9cdca 100644
--- a/usr/lib/systemd/user/swayidle.service
+++ b/usr/lib/systemd/user/swayidle.service
@@ -6,7 +6,7 @@ ConditionPathExists=/usr/bin/swayidle
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/swayidle
+ExecStart=/usr/bin/swayidle -w
 
 [Install]
 WantedBy=river-session.target