diff --git a/rofi/.config/herbstluftwm/autostart.d/rofi.sh b/rofi/.config/herbstluftwm/autostart.d/rofi.sh
index 31cb73e..ed99b8c 100755
--- a/rofi/.config/herbstluftwm/autostart.d/rofi.sh
+++ b/rofi/.config/herbstluftwm/autostart.d/rofi.sh
@@ -5,10 +5,12 @@ if ! whence hc; then
 fi
 
 # Run things with rofi
-hc keybind Mod4-r spawn rofi -show run -m 1
+hc keybind Mod4-r spawn rofi -show drun \
+   -config "$HOME/.config/rofi/rofi.rasi"
 
 # Use a special rofi configuration that allows windows to be locked by
 # herbstluftwm.
-hc keybind Mod4-w spawn rofi -show window -m 1 \
+hc keybind Mod4-w spawn rofi -show window \
     -window-command "$HOME/usr/bin/hlwm-switch-to-window {window}" \
-    -config "$HOME/.config/rofi/windows.conf"
+    -config "$HOME/.config/rofi/windows.rasi" \
+    -theme yoshi