diff --git a/swappy/config b/swappy/config
index 002d97e..19971b8 100644
--- a/swappy/config
+++ b/swappy/config
@@ -7,3 +7,4 @@ text_size=20
 text_font=lovebeat
 paint_mode=brush
 early_exit=false
+custom_color=rgba(255,112,122,1)
diff --git a/sway/config b/sway/config
index fa87d40..9f36e63 100644
--- a/sway/config
+++ b/sway/config
@@ -252,11 +252,11 @@ default_border pixel 2
 exec wlsunset -t 6499 -T 6500 -g 0.9
 
 # Volume controls
-bindsym XF86AudioRaiseVolume exec $volume_command 4 $volume_change_sound
-bindsym XF86AudioLowerVolume exec $volume_command -4 $volume_change_sound
-bindsym shift+XF86AudioRaiseVolume exec $volume_command 1 $volume_change_sound
-bindsym shift+XF86AudioLowerVolume exec $volume_command -1 $volume_change_sound
-bindsym XF86AudioMute exec ~/.config/sway/toggle_mute.sh
+bindsym --locked XF86AudioRaiseVolume exec $volume_command 4 $volume_change_sound
+bindsym --locked XF86AudioLowerVolume exec $volume_command -4 $volume_change_sound
+bindsym --locked shift+XF86AudioRaiseVolume exec $volume_command 1 $volume_change_sound
+bindsym --locked shift+XF86AudioLowerVolume exec $volume_command -1 $volume_change_sound
+bindsym --locked XF86AudioMute exec ~/.config/sway/toggle_mute.sh
 
 # External brightness control
   # For laptops
@@ -287,6 +287,8 @@ bindsym $mod2+q kill
 floating_modifier $mod1 normal
   # Screenlock
 bindsym $mod2+i exec ~/.config/sway/brightness_lock.sh
+  # Screen kill (turns off display output, but keeps virtual display active)
+bindsym --locked $mod2+u output * power toggle
   # Scratchpad
 bindsym $mod1+Shift+minus move scratchpad
 bindsym $mod1+minus scratchpad show
@@ -438,9 +440,9 @@ set $laptop 'eDP-1'
 set $sleep sleep 3 && swaylock
 
 bindswitch --reload --locked lid:on exec \
-    swaymsg output $laptop dpms off && swaylock
+    swaymsg output $laptop power off && swaylock
 bindswitch --reload --locked lid:off exec \
-    swaymsg output $laptop dpms on
+    swaymsg output $laptop power on
 
 exec swayidle -w timeout 1200 '~/.config/sway/suspend_system.sh'
 
@@ -462,8 +464,8 @@ include /etc/sway/config.d/*
 #
 #exec swayidle -w \
 #    timeout 101 'swaylock' \
-#    timeout 314 'swaymsg "output * dpms off"' \
-#        resume  'swaymsg "output * dpms on"'  \
+#    timeout 314 'swaymsg "output * power off"' \
+#        resume  'swaymsg "output * power on"'  \
 #    timeout 626 'systemctl suspend ' \
 #    before-sleep 'swaylock'
 
@@ -473,7 +475,7 @@ include /etc/sway/config.d/*
 #
 # exec swayidle -w \
 #          timeout 300 'swaylock -f -c 000000' \
-#          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
 #          before-sleep 'swaylock -f -c 000000'
 #
 # This will lock your screen after 300 seconds of inactivity, then turn off
diff --git a/vimiv/vimiv.conf b/vimiv/vimiv.conf
index fef1cf4..0a4d934 100644
--- a/vimiv/vimiv.conf
+++ b/vimiv/vimiv.conf
@@ -57,6 +57,10 @@ keys1 = Exif.Image.Make, Exif.Image.Model, Exif.Image.DateTime, Exif.Photo.Expos
 keys2 = Exif.Photo.ExposureTime, Exif.Photo.FNumber, Exif.Photo.IsoSpeedRatings, Exif.Photo.FocalLength
 keys3 = Exif.Image.Artist, Exif.Image.Copyright
 
+[SORT]
+image_order = natural
+directory_order = natural
+
 [PLUGINS]
 print = default
 imageformats = avif