diff --git a/assets/rofi/themes/paper-float.rasi b/assets/rofi/themes/paper-float.rasi
index 0b9e5c1..1e45c6f 100644
--- a/assets/rofi/themes/paper-float.rasi
+++ b/assets/rofi/themes/paper-float.rasi
@@ -5,6 +5,7 @@
  * Copyright: Dave Davenport
  */
 * {
+    font: "Source Code Pro 11";
     background: #222222;
     active-background: #0005;
     active-background-selected: #fff1;
@@ -22,6 +23,7 @@
 
     highlight: bold #fff;
 }
+
 #window {
     transparency: "screenshot";
     background-color: #00000000;
@@ -30,22 +32,26 @@
     x-offset: 0;
     y-offset: -10%;
 }
+
 #mainbox {
     padding: 0px;
     border: 0;
     spacing: 1%;
 }
+
 #message {
     border: 2px; 
     padding: 1em; 
     background-color: @background; 
     text-color: @text;
 }
+
 #textbox normal {
     text-color: @text;
     padding: 0;
     border: 0;
 }
+
 #listview {
     fixed-height: 1;
     border: 2px;
@@ -55,50 +61,62 @@
     columns: 1;
     background-color: @background; 
 }
+
 #element {
     border: 0;
     padding: 2px;
 }
+
 #element normal.normal {
     text-color: @text;
     background-color: @background;
 }
+
 #element normal.urgent {
     text-color: @text;
     background-color: @background;
 }
+
 #element normal.active {
     text-color: @text;
     background-color: @active-background;
 }
+
 #element selected.normal {
     text-color: @text;
     background-color: #fff1;
 }
+
 #element selected.urgent {
     text-color: @text;
     background-color: @background;
 }
+
 #element selected.active {
     text-color: @text;
     background-color: @active-background-selected;
 }
+
 #element alternate.normal {
     text-color: @text;
     background-color: @background;
 }
+
 #element alternate.urgent {
     text-color: @text;
     background-color: @background;
 }
+
 #element alternate.active {
     text-color: @text;
     background-color: @active-background;
 }
+
 #scrollbar {
     border: 0;
     padding: 0;
 }
+
 #inputbar {
     spacing: 0;
     border: 2px;
@@ -106,6 +124,7 @@
     background-color: @background;
     index: 0;
 }
+
 #inputbar normal {
     foreground-color: @text;
     background-color: @background;
@@ -117,21 +136,27 @@
     background-color: @background;
     index: 10;
 }
+
 #button selected {
     text-color: @text;
 }
+
 #inputbar {
     children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
+
 #prompt {
     text-color: @text;
 }
+
 #entry {
     text-color: @text;
 }
+
 #case-indicator {
     text-color: @text;
 }
+
 #textbox-prompt-colon {
     expand:     false;
     str:        ":";
diff --git a/config.lua b/config.lua
index c3ba421..5c9c83d 100644
--- a/config.lua
+++ b/config.lua
@@ -4,12 +4,8 @@
 local awful = require("awful")
 local naughty = require("naughty")
 
-local theme = require("theme")
-
 local config = {}
 
-local rofi_font = "\"" .. theme.mono_font .. "\""
-
 --
 -- Awesome WM
 --
@@ -23,8 +19,8 @@ config.awesome = {
 
     -- Application launcher
     application_launcher_check = "rofi -version",
-    application_launcher = "rofi -show drun -modi drun -show-icons -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi -font " .. rofi_font,
-    application_launcher_cmd = "rofi -show run -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi -font " .. rofi_font,
+    application_launcher = "rofi -show drun -modi drun -show-icons -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi",
+    application_launcher_cmd = "rofi -show run -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi",
 
     -- Screen locker
     lock_command = "i3lock --blur=5 -f -k --time-color=ffffffff --date-color=ffffffff --indicator --ring-color=aaaaaaaa",
@@ -62,9 +58,6 @@ config.awesome = {
 -- config.awesome.editor = "vi"
 config.awesome.editor = "code"
 
--- Default text editor command
-config.awesome.editor_cmd = config.awesome.terminal .. " -e " .. config.awesome.editor
-
 
 --
 -- Keys / Hotkeys / Shortcuts
@@ -203,7 +196,7 @@ config.theme = awful.util.getdir("config") .. "/theme.lua"
 config.screenshot_utility_command = "flameshot gui"
 
 -- Run menu
-config.windowSwitcher = "rofi -show window -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi -font " .. rofi_font
+config.windowSwitcher = "rofi -show window -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi"
 
 -- Media control
 config.volume_osd_timeout = 2