diff --git a/x11/.Xdefaults b/x11/.Xdefaults
index afd003b..8edc8e7 100644
--- a/x11/.Xdefaults
+++ b/x11/.Xdefaults
@@ -134,33 +134,4 @@ static void print_sample_message(XWindow *win) {\n\
   win.label->text = "Sample text 0123456789"\n\
 }
 
-!!! Rofi
-rofi.font: Fantasque Sans Mono 13
-! Key for run dialog
-rofi.key-run: Mod4-r
-! Key for window switcher
-rofi.key-window: Mod4-w
-! Background color
-rofi.bg: #111111
-! Alternating background color
-rofi.bgalt: #111111
-! Border color
-rofi.bc: #111111
-! Border width (px)
-rofi.bw: 0
-! Foreground color
-rofi.fg: #bfbfbf
-rofi.fg-urgent: #a85454
-rofi.fg-active: #54a875
-! Highlighted background color
-rofi.hlbg: #1f2c3f
-rofi.hlbg-active: #343922
-! Highlighted foreground color
-rofi.hlfg: #bfbfbf
-rofi.hlfg-active: #ececec
-rofi.width: 100
-rofi.location: 0
-rofi.opacity: 95
-rofi.padding: 400
-rofi.lines: 10
-rofi.eh: 2
+#include ".config/Xresources/Rofi.conf"
diff --git a/x11/.config/Xresources/Rofi.conf b/x11/.config/Xresources/Rofi.conf
new file mode 100644
index 0000000..6bcf2a7
--- /dev/null
+++ b/x11/.config/Xresources/Rofi.conf
@@ -0,0 +1,45 @@
+! Use a nice font.
+rofi.font: Fantasque Sans Mono 13
+
+! Use Mod4 (Super, Windows) and r to open Rofis run dialog.
+rofi.key-run: Mod4-r
+
+! Use Mod4 (Super, Windows) and w to open Rofis windows dialog.
+rofi.key-window: Mod4-w
+
+! Setup the theme to match my Emacs and URxvt colors.
+rofi.bg: backgroundColor
+rofi.bgalt: backgroundColor
+rofi.bc: backgroundColor
+rofi.fg: foregroundColor
+rofi.fg-urgent: fgred
+rofi.fg-active: fgturquoise
+rofi.hlbg: bgblue
+rofi.hlbg-active: bgyellow
+rofi.hlfg: foregroundColor
+rofi.hlfg-active: fgbright
+
+! Remove the border
+rofi.bw: 0
+
+! Make the window approximately 30 characters wide.
+rofi.width: -30
+
+! Put rofi in the top-right corner of the screen.
+rofi.location: 3
+
+! Make rofi almost completely opaque.
+rofi.opacity: 95
+
+! Give the rofi window 15 pixels padding, just like the Emacs and
+! URxvt windows.
+rofi.padding: 15
+
+! Always show 41 lines with 6 pixels margin between each. This makes
+! it line up (almost) exactly with the bottom of my screen, giving it
+! a sidebar look. The fixed-num-lines is required for when there are
+! less than 24 possible options when rofi starts. Which happens a lot
+! when working with windows.
+rofi.lines: 41
+rofi.line-margin: 6
+rofi.fixed-num-lines: true