diff --git a/.config/sway/common/11-idle_lock.conf b/.config/sway/common/11-idle_lock.conf
index 81a5a3c..cbd67df 100644
--- a/.config/sway/common/11-idle_lock.conf
+++ b/.config/sway/common/11-idle_lock.conf
@@ -2,18 +2,20 @@
 #
 # Thurstylark
 
-set $lock-time 600
-set $dispsleep-time 900
+set $lock-time 900
+set $dispsleep-time 600
 
 set $dispsleep 'swaymsg "output * dpms off"'
 set $dispwake 'swaymsg "output * dpms on"'
 
-set $locker "swaylock -f -F -l -c 000000"
+set $locker "swaylock -e -f -F -l -c 000000"
+set $unlocker "killall swaylock"
 
 exec swayidle -w \
 	timeout $lock-time $locker \
-#	timeout $dispsleep-time $dispsleep \
+	timeout $dispsleep-time $dispsleep \
 	resume $dispwake \
 	after-resume $dispwake \
 	before-sleep $locker \
-	lock $locker
+	lock $locker \
+	unlock $unlocker