diff --git a/modules/themes/fluorescence/polybar/config b/modules/themes/fluorescence/polybar/config
index 564fb1d9..6476c323 100644
--- a/modules/themes/fluorescence/polybar/config
+++ b/modules/themes/fluorescence/polybar/config
@@ -69,7 +69,7 @@ font-2 = "Siji:pixelsize=10;2"
 ; modules-left = volume pad cpu memory pad pkg mail
 modules-left = pulseaudio pad cpu memory
 modules-center = bspwm
-modules-right = battery wlan syncthing redshift pad date
+modules-right = wlan syncthing redshift pad battery pad date
 
 ;tray-position = center
 ;tray-padding = 2
@@ -81,13 +81,13 @@ type = internal/bspwm
 pin-workspaces = true
 enable-click = true
 
-ws-icon-0 = 1;
-ws-icon-1 = 2;
-ws-icon-2 = 3;
-ws-icon-3 = 4;
-ws-icon-4 = 5;
-ws-icon-5 = 6;
-ws-icon-default = x
+# ws-icon-0 = 1;
+# ws-icon-1 = 2;
+# ws-icon-2 = 3;
+# ws-icon-3 = 4;
+# ws-icon-4 = 5;
+# ws-icon-5 = 6;
+ws-icon-default = 
 
 format = <label-state> <label-mode>
 label-padding = 1
@@ -291,13 +291,15 @@ format-full-underline = ${self.format-charging-underline}
 ramp-capacity-0 = 
 ramp-capacity-1 = 
 ramp-capacity-2 = 
-ramp-capacity-foreground = ${colors.fg-alt}
+ramp-capacity-0-foreground = ${colors.red}
+ramp-capacity-1-foreground = #575864
+ramp-capacity-2-foreground = ${colors.fg-alt}
 
 animation-charging-0 = 
 animation-charging-1 = 
 animation-charging-2 = 
-animation-charging-foreground = ${colors.fg-alt}
-animation-charging-framerate = 750
+animation-charging-framerate = 1000
+animation-charging-foreground = ${colors.fg}
 
 
 ;=====================================================
diff --git a/modules/themes/fluorescence/polybar/run.sh b/modules/themes/fluorescence/polybar/run.sh
old mode 100755
new mode 100644
index 528a069a..cb4b37e0
--- a/modules/themes/fluorescence/polybar/run.sh
+++ b/modules/themes/fluorescence/polybar/run.sh
@@ -3,5 +3,5 @@
 killall -q polybar
 while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
-polybar main >>$XDG_DATA_HOME/polybar.log 2>&1 &
-echo 'Polybar launched...'
\ No newline at end of file
+polybar main >$XDG_DATA_HOME/polybar.log 2>&1 &
+echo 'Polybar launched...'
diff --git a/modules/themes/fluorescence/rofi/bookmarkmenu.rasi b/modules/themes/fluorescence/rofi/bookmarkmenu.rasi
index 3bd91618..986d0584 100644
--- a/modules/themes/fluorescence/rofi/bookmarkmenu.rasi
+++ b/modules/themes/fluorescence/rofi/bookmarkmenu.rasi
@@ -2,9 +2,10 @@
 
 @import "config.rasi"
 
-window {
-  width: 44%;
+listview {
+  columns: 1;
 }
+
 textbox-icon {
   str: " 爵 ";
 }
diff --git a/modules/themes/fluorescence/rofi/config.rasi b/modules/themes/fluorescence/rofi/config.rasi
index 2de73455..29988be6 100644
--- a/modules/themes/fluorescence/rofi/config.rasi
+++ b/modules/themes/fluorescence/rofi/config.rasi
@@ -20,9 +20,9 @@ configuration {
   magenta: #bd93f9;
   blue:    #61bfff;
 
-  text-font:        "Fira Sans 16";
-  text-mono-font:   "Fira Code 14";
-  icon-font:        "Hurmit Nerd Font Mono 26";
+  text-font:      "Fira Sans 15";
+  text-mono-font: "Fira Code 13";
+  icon-font:      "Hurmit Nerd Font Mono 26";
 
   background-color: transparent;
   text-color: @fg-list;
@@ -33,29 +33,45 @@ configuration {
 
 /**** Layout ****/
 window {
-  width:    34%;
-  y-offset: -25%;
+  width:    1000px;
+  y-offset: -50px;
   anchor:   north;
   location: center;
   border: 1px;
-  border-radius: 6px;
+  border-radius: 6px 6px 0 0;
   children: [ inputbar, listview ];
+
 }
+
 listview {
-  lines: 16;
+  lines: 12;
   fixed-height: false;
   /* reverse: true; */
-  margin: -2px 0 0;
-  columns: 1;
+  columns: 2;
   scrollbar: true;
   spacing: 1px;
+  /* Remove strange gap between listview and inputbar */
+  margin: -2px 0 0;
 }
+
+/*
+  TODO Not supported in stable branch of rofi
+  @media only (max-height: 1080px) {
+    window {
+      y-offset: -30%;
+    }
+    listview {
+      lines: 14;
+    }
+  }
+*/
+
 scrollbar {
   handle-width: 1px;
 }
 inputbar {
   children: [ textbox-icon, prompt, entry ];
-  border: 0 0 1px;
+  border: 0 0 0;
 }
 textbox-icon, prompt {
   padding: 11px;
@@ -67,7 +83,7 @@ textbox-icon {
   padding: 7px -6px 0;
 }
 entry, element {
-  padding: 11px 14px;
+  padding: 10px 13px;
 }
 textbox {
   padding: 24px;
diff --git a/modules/themes/fluorescence/rofi/windowmenu.rasi b/modules/themes/fluorescence/rofi/windowmenu.rasi
index 1f432d85..1c7ffde9 100644
--- a/modules/themes/fluorescence/rofi/windowmenu.rasi
+++ b/modules/themes/fluorescence/rofi/windowmenu.rasi
@@ -2,8 +2,12 @@
 
 @import "config.rasi"
 
+listview {
+  columns: 1;
+}
+
 inputbar {
-  width: 25%;
+  width: 1100px;
 }
 
 textbox-icon {
@@ -14,6 +18,10 @@ prompt {
   enabled: false;
 }
 
+/**
+ * Elements are tab-delimited, which look weird in the default variable-pitch
+ * font, so use a monospace one.
+ */
 element {
   font: "Fira Code 12";
 }