diff --git a/config/automatrop/roles/desktop_environment/tasks/main.yml b/config/automatrop/roles/desktop_environment/tasks/main.yml
index 781be24..2e80813 100644
--- a/config/automatrop/roles/desktop_environment/tasks/main.yml
+++ b/config/automatrop/roles/desktop_environment/tasks/main.yml
@@ -6,6 +6,7 @@
   with_items:
     - ".config/Xresources"
     - ".config/rofi"
+    - ".local/share/rofi/themes"
     - ".local/bin"
     - ".local/share/fonts"
     - ".config/qutebrowser"
@@ -108,17 +109,24 @@
     - color
   when: display_server == 'x11'
 
-- name: Set base16 theme for rofi
+- name: Set base16 theme for rofi < 1.4
   copy:
-    content: "{{ base16_schemes['schemes'][base16_scheme]['rofi']['themes']['base16-' + base16_scheme + '.' + item] }}"
-    dest: "{{ ansible_env.HOME }}/.config/rofi/theme.{{ item }}"
+    content: "{{ base16_schemes['schemes'][base16_scheme]['rofi']['themes']['base16-' + base16_scheme + '.config'] }}"
+    dest: "{{ ansible_env.HOME }}/.config/rofi/theme.config"
     mode: "u=rw,g=r,o=r"
-  with_items:
-    - rasi
-    - config
   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
+
 - name: Configure Dunst
   template:
     src: "{{ ansible_env.HOME }}/.config/dunst/dunstrc.j2"
diff --git a/config/rofi/.gitignore b/config/rofi/.gitignore
index c1955d4..83193ec 100644
--- a/config/rofi/.gitignore
+++ b/config/rofi/.gitignore
@@ -1,3 +1 @@
 theme.config
-theme.rasi
-
diff --git a/config/rofi/config b/config/rofi/config
index 64a7e14..fc193ca 100644
--- a/config/rofi/config
+++ b/config/rofi/config
@@ -1,8 +1,4 @@
 #include "theme.config"
 rofi.theme: theme
-rofi.cycle: true
-rofi.case-sensitive: false
-rofi.scroll-method: 0
-rofi.show-match: true
 rofi.lazy-grab: false
 rofi.matching: regex
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
new file mode 100644
index 0000000..af02ce7
--- /dev/null
+++ b/config/rofi/config.rasi
@@ -0,0 +1,6 @@
+configuration {
+    theme: "current";
+    lazy-grab: false;
+    matching: "regex";
+}
+