diff --git a/bin/xss-lock b/bin/xss-lock
index c5f8d88..53653e4 100755
--- a/bin/xss-lock
+++ b/bin/xss-lock
@@ -34,7 +34,7 @@ case "$1" in
         playerctl -a pause
         dunstctl set-paused true
         # Then, lock screen
-        i3lock -n -e -i $HOME/.cache/i3/current-wallpaper.png -t -f
+        i3lock -n -e -i $XDG_RUNTIME_DIR/i3/current-wallpaper.png -t -f
         # Alternative if we prefer videos:
         # XSECURELOCK_SAVER=saver_mpv
         # XSECURELOCK_LIST_VIDEOS_COMMAND="ls -1 ~/.config/i3/wallpapers/*.mp4"
diff --git a/dotfiles/systemd/picom.service b/dotfiles/systemd/picom.service
index 850cb0f..37e49bb 100644
--- a/dotfiles/systemd/picom.service
+++ b/dotfiles/systemd/picom.service
@@ -4,6 +4,6 @@ PartOf=graphical-session.target
 
 [Service]
 ExecStartPre=%h/.config/i3/bin/picom-configure
-ExecStart=%h/.local/bin/picom --config ${XDG_RUNTIME_DIR}/i3/picom.conf --experimental-backends
+ExecStart=%h/.local/bin/picom --config %t/i3/picom.conf --experimental-backends
 ExecReload=%h/.config/i3/bin/picom-configure
 Restart=on-failure
diff --git a/dotfiles/systemd/polybar-weather.service b/dotfiles/systemd/polybar-weather.service
index ce7915c..3f525be 100644
--- a/dotfiles/systemd/polybar-weather.service
+++ b/dotfiles/systemd/polybar-weather.service
@@ -7,7 +7,7 @@ Requisite=polybar.service
 [Service]
 # Get one from https://openweathermap.org/, it's free
 Environment=OWM_API_KEY=81687c78e0376836871a6cb9fc347249
-ExecStart=/usr/bin/mkdir -p %h/.cache/i3
+ExecStart=/usr/bin/mkdir -p %t/i3
 ExecStart=%h/.config/i3/bin/polybar-weather
 Type=oneshot
 RemainAfterExit=false
diff --git a/dotfiles/systemd/wallpaper.service b/dotfiles/systemd/wallpaper.service
index 2a6e626..dc5dcd6 100644
--- a/dotfiles/systemd/wallpaper.service
+++ b/dotfiles/systemd/wallpaper.service
@@ -4,8 +4,8 @@ PartOf=graphical-session.target
 
 [Service]
 Environment=WALLPAPER_DIRECTORY=%h/.config/i3/wallpapers
-Environment=WALLPAPER_OUTPUT=%h/.cache/i3/current-wallpaper.png
-ExecStart=/usr/bin/mkdir -p %h/.cache/i3
+Environment=WALLPAPER_OUTPUT=%t/i3/current-wallpaper.png
+ExecStart=/usr/bin/mkdir -p %t/i3
 ExecStart=%h/.config/i3/bin/wallpaper --directory $WALLPAPER_DIRECTORY \
                                       --target $WALLPAPER_OUTPUT
 ExecStart=/usr/bin/hsetroot -root -center $WALLPAPER_OUTPUT
diff --git a/dotfiles/systemd/xss-dimmer@.service b/dotfiles/systemd/xss-dimmer@.service
index 7190993..39a6cd9 100644
--- a/dotfiles/systemd/xss-dimmer@.service
+++ b/dotfiles/systemd/xss-dimmer@.service
@@ -4,4 +4,4 @@ Description=Screen dimmer
 [Service]
 ExecStart=%h/.config/i3/bin/xss-dimmer --delay=%i \
                                        --font "Monkey Island 1991" \
-                                       --background=%h/.cache/i3/current-wallpaper.png
+                                       --background=%t/i3/current-wallpaper.png