diff --git a/tasks/dconf-lock.yaml b/tasks/dconf.yaml
similarity index 83%
rename from tasks/dconf-lock.yaml
rename to tasks/dconf.yaml
index e72e007..4d7adb9 100644
--- a/tasks/dconf-lock.yaml
+++ b/tasks/dconf.yaml
@@ -24,7 +24,7 @@
 - name: dconf settings
   template:
     src: dconf-lock/settings.j2
-    dest: /etc/dconf/db/local.d/{{dconf_lock_id}}
+    dest: /etc/dconf/db/local.d/{{dconf_id}}
   notify: dconf update
 
 - name: dconf locks directory
@@ -35,5 +35,6 @@
 - name: dconf locks
   template:
     src: dconf-lock/locks.j2
-    dest: /etc/dconf/db/local.d/locks/{{dconf_lock_id}}
+    dest: /etc/dconf/db/local.d/locks/{{dconf_id}}
+  when: dconf_lock_paths is defined
   notify: dconf update
diff --git a/tasks/screensaver.yaml b/tasks/screensaver.yaml
index 7109579..027cf81 100644
--- a/tasks/screensaver.yaml
+++ b/tasks/screensaver.yaml
@@ -21,15 +21,17 @@
     dest: /usr/local/bin/mate-screensaver-helper-inhibition
     mode: 0755
 
-- import_tasks: dconf-lock.yaml
+- import_tasks: dconf.yaml
   vars:
-    dconf_lock_id: screensaver
+    dconf_id: screensaver
     dconf_lock_settings:
       /org/mate/screensaver:
         idle-activation-enabled: 'true'
         lock-enabled: 'true'
-        mode: "'single'"
-        themes: "['{{screensaver_theme}}']"
+        mode:
+          - single
+        themes:
+          - "{{screensaver_theme}}"
       /org/mate/desktop/session:
         idle-delay: "{{ screensaver_locktime | int }}"
       /org/mate/power-manager: