diff --git a/defaults/main.yml b/defaults/main.yml
index 14fb16f..e236441 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -34,3 +34,6 @@ kiosk_unlocked_users: root
 xfwm4_use_compositing: true
 
 xfce_lock_panel: true
+
+xscreensaver_dpms: true
+xscreensaver_timeout: 900
diff --git a/templates/Xresources.xscreensaver.j2 b/templates/Xresources.xscreensaver.j2
index f1b1229..e1db4fe 100644
--- a/templates/Xresources.xscreensaver.j2
+++ b/templates/Xresources.xscreensaver.j2
@@ -1,10 +1,21 @@
 xscreensaver.mode: blank
 
-xscreensaver.timeout: 0:15:00
-xscreensaver.lockTimeout: 0:15:00
+xscreensaver.timeout: {{ (xscreensaver_timeout / 60 / 60) | round | int }}:{{ (xscreensaver_timeout / 60 % 60) | round | int }}:{{ xscreensaver_timeout % 60 }}
+xscreensaver.lockTimeout: {{ (xscreensaver_timeout / 60 / 60) | round | int }}:{{ (xscreensaver_timeout / 60 % 60) | round | int }}:{{ xscreensaver_timeout % 60 }}
 xscreensaver.passwdTimeout: 0:00:30
 
+{% if xscreensaver_dpms %}
+xscreensaver.dpmsEnabled: True
 xscreensaver.dpmsQuickoffEnabled: True
+xscreensaver.dpmsStandby: {{ (xscreensaver_timeout / 60 / 60) | round | int }}:{{ (xscreensaver_timeout / 60 % 60) | round | int }}:{{ xscreensaver_timeout % 60 }}
+xscreensaver.dpmsSuspend: {{ (xscreensaver_timeout / 60 / 60) | round | int }}:{{ (xscreensaver_timeout / 60 % 60) | round | int }}:{{ xscreensaver_timeout % 60 }}
+xscreensaver.dpmsOff: {{ (xscreensaver_timeout / 60 / 60) | round | int }}:{{ (xscreensaver_timeout / 60 % 60) | round | int }}:{{ xscreensaver_timeout % 60 }}
+{% else %}
+xscreensaver.dpmsEnabled: False
+xscreensaver.dpmsQuickoffEnabled: False
+{% endif %}
+
+xscreensaver.cycle: 0:15:00
 
 xscreensaver.grabDesktopImages: False
 xscreensaver.grabVideoFrames: False