diff --git a/config/automatrop/roles/desktop_environment/tasks/main.yml b/config/automatrop/roles/desktop_environment/tasks/main.yml
index 2e80813..31a7f92 100644
--- a/config/automatrop/roles/desktop_environment/tasks/main.yml
+++ b/config/automatrop/roles/desktop_environment/tasks/main.yml
@@ -6,7 +6,6 @@
   with_items:
     - ".config/Xresources"
     - ".config/rofi"
-    - ".local/share/rofi/themes"
     - ".local/bin"
     - ".local/share/fonts"
     - ".config/qutebrowser"
@@ -109,23 +108,16 @@
     - color
   when: display_server == 'x11'
 
-- name: Set base16 theme for rofi < 1.4
+- name: Set base16 theme for rofi
   copy:
-    content: "{{ base16_schemes['schemes'][base16_scheme]['rofi']['themes']['base16-' + base16_scheme + '.config'] }}"
-    dest: "{{ ansible_env.HOME }}/.config/rofi/theme.config"
+    content: "{{ base16_schemes['schemes'][base16_scheme]['rofi']['themes']['base16-' + base16_scheme + '.' + item] }}"
+    dest: "{{ ansible_env.HOME }}/.config/rofi/theme.{{ item }}"
     mode: "u=rw,g=r,o=r"
   tags:
     - color
-
-- name: Set base16 theme for rofi >= 1.4
-  copy:
-    content: "{{ base16_schemes['schemes'][base16_scheme]['rofi']['themes']['base16-' + base16_scheme + '.rasi'] }}"
-    dest: "{{ ansible_env.HOME }}/.local/share/rofi/themes/current.rasi"
-    mode: "u=rw,g=r,o=r"
-  tags:
-    - color
-    - g
-  when: no
+  loop:
+    - config
+    - rasi
 
 - name: Configure Dunst
   template:
diff --git a/config/rofi/.gitignore b/config/rofi/.gitignore
index 83193ec..ba58f6e 100644
--- a/config/rofi/.gitignore
+++ b/config/rofi/.gitignore
@@ -1 +1,2 @@
 theme.config
+theme.rasi
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index af02ce7..9843b5f 100644
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -1,6 +1,5 @@
 configuration {
-    theme: "current";
     lazy-grab: false;
     matching: "regex";
 }
-
+@theme "theme"