diff --git a/.config/hypr/conf.d/40-keybinds.conf##hostname.viking-mate b/.config/hypr/conf.d/40-keybinds.conf##hostname.viking-mate
index a3ea7c7..fac31db 100644
--- a/.config/hypr/conf.d/40-keybinds.conf##hostname.viking-mate
+++ b/.config/hypr/conf.d/40-keybinds.conf##hostname.viking-mate
@@ -105,9 +105,6 @@ bindm = $mainMod SHIFT, mouse:272, movewindow
 bindm = $mainMod SHIFT, mouse:273, resizewindow
 
 # Audio via PipeWire ctl (desktop style)
-bindl = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
-bindl = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindl = , XF86AudioMute,        exec, wpctl set-mute   @DEFAULT_AUDIO_SINK@ toggle
 bindl = , XF86AudioPlay, exec, playerctl play-pause
 bindl = , XF86AudioPrev, exec, playerctl previous
 bindl = , XF86AudioNext, exec, playerctl next
diff --git a/.config/hypr/conf.d/50-autostart.conf##hostname.viking-mate b/.config/hypr/conf.d/50-autostart.conf##hostname.viking-mate
index e9fcb30..0d9ec85 100644
--- a/.config/hypr/conf.d/50-autostart.conf##hostname.viking-mate
+++ b/.config/hypr/conf.d/50-autostart.conf##hostname.viking-mate
@@ -4,8 +4,8 @@ exec-once = uwsm app -- swaync
 exec-once = xsettingsd
 exec-once = ~/.config/waybar/scripts/hyprsunset_daemon.sh
 exec-once = uwsm app -- waybar
-exec = hyprpaper -c $HOME/.config/hyprpaper.conf
-exec = swayosd-server
+exec-once = hyprpaper -c $HOME/.config/hyprpaper.conf
+exec-once = swayosd-server
 exec-once = hypridle
 
 
@@ -13,12 +13,6 @@ exec-once = hypridle
 exec-once = bash -lc 'command -v nm-applet >/dev/null && nm-applet &'
 exec-once = bash -lc 'command -v blueman-applet >/dev/null && blueman-applet &'
 
-exec-once = pkill swayidle; swayidle \
-  timeout 300  'brightnessctl set 25%' \
-  timeout 600  'swaylock -f -c 000000' \
-  timeout 600  'hyprctl dispatch dpms off' \
-  resume       'hyprctl dispatch dpms on' \
-  before-sleep 'swaylock -f -c 000000'
 
 exec-once = pkill mako; mako
 exec-once = pkill wl-paste; wl-paste -t text --watch clipman store
diff --git a/.config/hypr/hypridle.conf##hostname.viking-mate b/.config/hypr/hypridle.conf##hostname.viking-mate
index a32d0a0..5230c2e 100644
--- a/.config/hypr/hypridle.conf##hostname.viking-mate
+++ b/.config/hypr/hypridle.conf##hostname.viking-mate
@@ -1,5 +1,11 @@
 # Same as cn-arch: lock at 10 min, screen off at 15 min.
 
+listener {
+  timeout = 300
+  on-timeout = brightnessctl --save && brightnessctl set 25%
+  on-resume = brightnessctl --restore
+}
+
 general {
   lock_cmd = hyprlock
   before_sleep_cmd = hyprlock