diff --git a/templates/screensaver-disable.sh.j2 b/templates/screensaver-disable.sh.j2
index cd256bd..292f49f 100644
--- a/templates/screensaver-disable.sh.j2
+++ b/templates/screensaver-disable.sh.j2
@@ -2,8 +2,8 @@
 
 # https://www.reddit.com/r/i3wm/comments/6gznzp/lock_screensaver_and_power_saving_how_to_trigger/
 
-xset s on
-xset +dpms
+xset s off
+xset -dpms
 
 # xset s <n1> <n2>
 # n1: is the time it takes to launch the first signal that the screen will be
diff --git a/templates/screensaver-lock/i3lock.sh.j2 b/templates/screensaver-lock/i3lock.sh.j2
index 9c8db36..4d99b0a 100644
--- a/templates/screensaver-lock/i3lock.sh.j2
+++ b/templates/screensaver-lock/i3lock.sh.j2
@@ -6,11 +6,13 @@
 ## CONFIGURATION ##############################################################
 
 # Options to pass to i3lock
-i3lock_options="-c 330033 -f"
+i3lock_options="-c 330033 -f -p default"
 
 # Run before starting the locker
 pre_lock() {
-    xset dpms force off
+    xset +dpms
+    xset dpms 5 5 5
+    xset s 5 5
     return
 }