diff --git a/defaults/main.yaml b/defaults/main.yaml
index 08e4c74..ed97d53 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -1,3 +1 @@
 ---
-xscreensaver_dpms: true
-xscreensaver_timeout: 900
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 469e142..7f0382f 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -4,28 +4,13 @@
   apt:
     pkg:
       - light-locker
+      - xscreensaver
     state: absent
 
-- name: uninstall light-locker-settings
-  file:
-    path: "{{ item }}"
-    state: absent
-  with_items:
-    - /usr/bin/light-locker-settings
-    - /usr/share/applications/light-locker-settings.desktop
-    - /usr/share/light-locker-settings
-    - /usr/share/doc/light-locker-settings
-    - /opt/light-locker-settings-1.5.3
-    - /opt/light-locker-settings-1.5.3.tar.bz2
-
-- name: install xscreensaver
+- name: install mate-screensaver
   apt:
-    pkg: xscreensaver
-
-- name: xscreensaver default settings
-  template:
-    src: Xresources.xscreensaver.j2
-    dest: /etc/X11/Xresources/xscreensaver
+    pkg:
+      - mate-screensaver
 
 - name: gdmflexiserver dummy script
   copy:
diff --git a/templates/Xresources.xscreensaver.j2 b/templates/Xresources.xscreensaver.j2
deleted file mode 100644
index b4db120..0000000
--- a/templates/Xresources.xscreensaver.j2
+++ /dev/null
@@ -1,34 +0,0 @@
-xscreensaver.mode: blank
-
-xscreensaver.timeout: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-xscreensaver.lockTimeout: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | 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(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-xscreensaver.dpmsSuspend: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-xscreensaver.dpmsOff: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-{% else %}
-xscreensaver.dpmsEnabled: False
-xscreensaver.dpmsQuickoffEnabled: False
-{% endif %}
-
-xscreensaver.grabDesktopImages: False
-xscreensaver.grabVideoFrames: False
-xscreensaver.chooseRandomImages: True
-
-xscreensaver.lock: True
-
-xscreensaver.fade: False
-xscreensaver.unfade: False
-
-xscreensaver.splash: False
-
-xscreensaver.passwd.heading.label: Sperrbildschirm
-xscreensaver.passwd.body.label: Dieser Bildschirm ist gesperrt.
-xscreensaver.passwd.unlock.label: OK
-xscreensaver.passwd.login.label: Benutzer wechseln
-
-xscreensaver.textMode: date