diff --git a/roles/dvorak/tasks/main.yml b/roles/dvorak/tasks/main.yml
index 2db6ecf..a850def 100644
--- a/roles/dvorak/tasks/main.yml
+++ b/roles/dvorak/tasks/main.yml
@@ -1,6 +1,8 @@
 ---
 - name: Enable dvorak for XOrg libinput
-  copy: src=40-libinput-dvorak.conf dest=/etc/X11/xorg.conf.d/40-libinput-dvorak.conf
+  template:
+    src: 40-libinput-dvorak.conf.j2
+    dest: /etc/X11/xorg.conf.d/40-libinput-dvorak.conf
 
 - name: Add control-caps dvorak keymap
   copy: src=dvorak-cc.map.gz dest=/usr/share/kbd/keymaps/i386/dvorak/dvorak-cc.map.gz
diff --git a/roles/dvorak/files/40-libinput-dvorak.conf b/roles/dvorak/templates/40-libinput-dvorak.conf.j2
similarity index 81%
rename from roles/dvorak/files/40-libinput-dvorak.conf
rename to roles/dvorak/templates/40-libinput-dvorak.conf.j2
index 58e1823..ddaeefb 100644
--- a/roles/dvorak/files/40-libinput-dvorak.conf
+++ b/roles/dvorak/templates/40-libinput-dvorak.conf.j2
@@ -5,5 +5,7 @@ Section "InputClass"
         Driver "libinput"
         Option "XkbLayout" "us"
         Option "XkbVariant" "dvorak"
+        {% if interception is not defined %}
         Option "XkbOptions" "ctrl:nocaps"
+        {% endif %}
 EndSection