diff --git a/.Xresources b/.Xresources
index a347e1c5..7070e95e 100644
--- a/.Xresources
+++ b/.Xresources
@@ -2,7 +2,7 @@
 ! URXVT
 !-----------------------------
 urxvt*scrollBar: false
-urxvt*font: xft:xos4 Terminus:size=9,xft:Wuncon Siji:pixelsize=12
+urxvt*font: xft:Hack:size=9
 urxvt*letterSpace: 0
 urxvt*depth: 32
 urxvt*geometry: 90x30
@@ -64,13 +64,15 @@ rofi.matching: fuzzy
 rofi.color-enabled: true
 rofi.show-icons: true
 rofi.drun-icon-theme: Papirus-Color
-rofi.font: xos4 Terminus 9
+rofi.columns: 3
+rofi.font: Helvetica CE 10
 rofi.bw: 4
+rofi.padding: 8
 !                  BG       	FG       	BG-ALT		HLBG		HLFG
 rofi.color-window: S_base03,	S_base02,	S_base03
 rofi.color-normal: S_base03,	S_base0,	S_base02,	S_base0,	S_base03
 rofi.color-active: S_base03,	S_blue,		S_base02,	S_blue,		S_base03
 rofi.color-urgent: S_base03,	S_yellow,	S_base02,	S_yellow,	S_base03
 
-rofi.width: 30
+rofi.width: 48
 
diff --git a/.config/polybar/config b/.config/polybar/config
index f2f0968a..899c3c2a 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -27,13 +27,13 @@ background-alt = ${xrdb:color10}
 foreground = ${xrdb:color15}
 
 [res/config]
-padding = 2
+padding = 3
 
 [res/fonts]
-font-0 = "xos4 Terminus:size=9;2"
-font-1 = "Wuncon Siji:size=9;2"
+font-0 = "Helvetica CE:size=10;2"
+font-1 = "Material Design Icons:size=13;3"
 font-2 = "FontAwesome:size=10;2"
-font-3 = "Material Design Icons:size=11;3"
+font-3 = "Wuncon Siji:size=9;2"
 font-4 =
 
 #========================================
@@ -45,22 +45,19 @@ font-4 =
 
 [template/bar]
 # Rendering of the bar
-width = 100%
-height = 30
+width = 40%
+height = 32
+offset-y = 10
 wm-restack = ${env:PB_WM_RESTACK:bspwm}
 
 # Module padding and spacing
-module-margin = 1
+padding = 3
+module-margin = 2
 
-# Mild ricing
-background = #00000000
+# Colors and Borders
+background = ${res/colors.background}
 foreground = ${res/colors.foreground}
-
-# Invisible border on three sides; it cooperates well with i3
-border-top-size = 10
-border-left-size = ${self.border-top-size}
-border-right-size = ${self.border-top-size}
-border-color = #00000000
+radius=4
 
 # Module fonts
 font-0 = ${res/fonts.font-0}
@@ -71,21 +68,29 @@ font-4 = ${res/fonts.font-4}
 
 # BARS
 #====================
-[bar/primary-top]
+[bar/primary-top-left]
 monitor = ${env:PB_MONITOR}
 inherit = template/bar
+offset-x = 5%
 
-modules-left = i3 bspwm cpu memory fs-home update-arch
-modules-center = 
-modules-right = wlan xbacklight volume battery date
+modules-left = i3 bspwm
+modules-right = update-arch cpu memory fs-home
+
+[bar/primary-top-right]
+monitor = ${env:PB_MONITOR}
+inherit = template/bar
+offset-x = 55%
+
+modules-left = wlan
+modules-right = xbacklight volume battery date
 
 [bar/secondary-top]
 monitor = ${env:PB_MONITOR}
 inherit = template/bar
+offset-x = 5%
 
 modules-left = i3 bspwm
-modules-center = xwindow
-modules-right =
+modules-right = xwindow
 
 #========================================
 # MODULES
@@ -103,10 +108,8 @@ content-foreground = ${res/colors.background-alt}
 [module/i3]
 type = internal/i3
 format = <label-state><label-mode>
-format-prefix = i3
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.background}
-format-prefix-background = ${res/colors.icon-wm}
+format-prefix = "i3 "
+format-prefix-foreground = ${res/colors.icon-wm}
 enable-scroll = false
 index-sort = true
 pin-workspaces = true
@@ -134,58 +137,13 @@ label-urgent-background = ${res/colors.alert}
 
 [module/bspwm]
 type = internal/bspwm
-format = <label-state><label-mode>
-format-prefix = b
-format-prefix-padding = 2
-format-prefix-foreground = ${res/colors.background}
-format-prefix-background = ${res/colors.icon-wm}
+format = <label-state>
+format-prefix = " "
+format-prefix-foreground = ${res/colors.icon-wm}
 enable-scroll = false
 pin-workspaces = 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-6 = 7;
-ws-icon-7 = 8;
-ws-icon-default = 
-
-label-monocle = 
-label-monocle-padding = ${res/config.padding}
-label-monocle-background = ${res/colors.icon-wm}
-label-monocle-foreground = ${res/colors.background}
-label-tiled = 
-label-tiled-padding = ${res/config.padding}
-label-tiled-background = ${res/colors.icon-wm}
-label-tiled-foreground = ${res/colors.background}
-label-fullscreen = 
-label-fullscreen-padding = ${res/config.padding}
-label-fullscreen-background = ${res/colors.icon-wm}
-label-fullscreen-foreground = ${res/colors.background}
-label-floating = 
-label-floating-padding = ${res/config.padding}
-label-floating-background = ${res/colors.icon-wm}
-label-floating-foreground = ${res/colors.background}
-label-pseudotiled = 
-label-pseudotiled-padding = ${res/config.padding}
-label-pseudotiled-background = ${res/colors.icon-wm}
-label-pseudotiled-foreground = ${res/colors.background}
-label-locked = 
-label-locked-padding = ${res/config.padding}
-label-locked-background = ${res/colors.icon-wm}
-label-locked-foreground = ${res/colors.background}
-label-sticky = 
-label-sticky-padding = ${res/config.padding}
-label-sticky-background = ${res/colors.icon-wm}
-label-sticky-foreground = ${res/colors.background}
-label-private = 
-label-private-padding = ${res/config.padding}
-label-private-background = ${res/colors.icon-wm}
-label-private-foreground = ${res/colors.background}
-
-label-focused = %icon%
+label-focused = %name%
 label-focused-padding = ${res/config.padding}
 label-focused-foreground = ${res/colors.background}
 label-focused-background = ${res/colors.secondary}
@@ -198,53 +156,41 @@ label-dimmed-background = ${res/colors.background-alt}
 label-occupied = ${self.label-focused}
 label-occupied-padding = ${res/config.padding}
 label-occupied-foreground = ${res/colors.foreground}
-label-occupied-background = ${res/colors.background}
 
 label-urgent = ${self.label-focused}
 label-urgent-padding = ${res/config.padding}
 label-urgent-foreground = ${res/colors.alert}
-label-urgent-background = ${res/colors.background}
 
 label-empty = ${self.label-focused}
 label-empty-padding = ${res/config.padding}
 label-empty-foreground = ${res/colors.background-alt}
-label-empty-background = ${res/colors.background}
 
 
 [module/battery]
 type = internal/battery
-format-charging = <ramp-capacity>
-format-charging-background = ${res/colors.background-alt}
-format-discharging = <ramp-capacity><label-discharging>
-format-discharging-background = ${res/colors.icon-battery}
+format-charging = <animation-charging> <label-charging>
+format-discharging = <ramp-capacity> <label-discharging>
 format-full = <label-full>
 time-format = %H:%M
-full-at = 98
+full-at = 95
 interval = 15
 
 label-charging = %percentage%%
-label-charging-padding = ${res/config.padding}
-label-charging-foreground = ${res/colors.background-alt}
-label-charging-background = ${res/colors.background}
 label-discharging = %percentage%%
-label-discharging-padding = ${self.label-charging-padding}
-label-discharging-background = ${res/colors.background}
-label-full = 
-label-full-padding = ${res/config.padding}
-label-full-foreground = ${res/colors.background}
-label-full-background = ${res/colors.alert}
+label-full = 
+label-full-foreground = ${res/colors.alert}
 
-ramp-capacity-0= 
-ramp-capacity-1= 
-ramp-capacity-2= 
-ramp-capacity-3= 
-ramp-capacity-4= 
-ramp-capacity-5= 
-ramp-capacity-6= 
-ramp-capacity-7= 
-ramp-capacity-8= 
-ramp-capacity-padding = ${res/config.padding}
-ramp-capacity-foreground = ${res/colors.background}
+ramp-capacity-0= 
+ramp-capacity-1= 
+ramp-capacity-2= 
+ramp-capacity-3= 
+ramp-capacity-4= 
+ramp-capacity-5= 
+ramp-capacity-6= 
+ramp-capacity-7= 
+ramp-capacity-8= 
+ramp-capacity-9= 
+ramp-capacity-foreground = ${res/colors.icon-battery}
 
 animation-charging-0 = ${self.ramp-capacity-0}
 animation-charging-1 = ${self.ramp-capacity-1}
@@ -255,135 +201,96 @@ animation-charging-5 = ${self.ramp-capacity-5}
 animation-charging-6 = ${self.ramp-capacity-6}
 animation-charging-7 = ${self.ramp-capacity-7}
 animation-charging-8 = ${self.ramp-capacity-8}
-animation-charging-padding = ${self.ramp-capacity-padding}
-animation-charging-foreground = ${res/colors.background}
-animation-charging-background = ${res/colors.background-alt}
+animation-charging-9 = ${self.ramp-capacity-9}
+animation-charging-foreground = ${res/colors.background-alt}
 animation-charging-framerate = 500
 
 [module/cpu]
 type = internal/cpu
 format = <label>
-format-prefix = 
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.background}
-format-prefix-background = ${res/colors.icon-cpu}
+format-prefix = " "
+format-prefix-foreground = ${res/colors.icon-cpu}
 interval = 1
 
 label = %percentage%%
-label-padding = ${res/config.padding}
 label-background = ${res/colors.background}
 
 [module/date]
 type = internal/date
 format = <label>
-format-prefix = 
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.background}
-format-prefix-background = ${res/colors.icon-date}
+format-prefix = " "
+format-prefix-foreground = ${res/colors.icon-date}
 date = %a
 time = %I:%M %p
 interval = 30
 
 label = %date% %time%
-label-padding = ${res/config.padding}
 label-background = ${res/colors.background}
 
 [module/fs-home]
 type = internal/fs
 format-mounted = <label-mounted>
-format-mounted-prefix = 
-format-mounted-prefix-padding = ${res/config.padding}
-format-mounted-prefix-foreground = ${res/colors.background}
-format-mounted-prefix-background = ${res/colors.icon-fs}
+format-mounted-prefix = " "
+format-mounted-prefix-foreground = ${res/colors.icon-fs}
 mount-0 = /home
 
 label-mounted = %percentage_used%%
-label-mounted-padding = ${res/config.padding}
 label-mounted-background = ${res/colors.background}
 
 [module/memory]
 type = internal/memory
 format = <label>
-format-prefix = 
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.background}
-format-prefix-background = ${res/colors.icon-memory}
+format-prefix = " "
+format-prefix-foreground = ${res/colors.icon-memory}
 interval = 1
 
 label = %percentage_used%%
-label-padding = ${res/config.padding}
 label-background = ${res/colors.background}
 
 [module/update-arch]
 type = custom/script
 exec = echo `checkupdates | wc -l`
 exec-if = wget -q --spider http://www.startpage.com/ && uname -r | grep -q "ARCH" && [ `checkupdates | wc -l` != 0 ]
-format-prefix = 
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.background}
-format-prefix-background = ${res/colors.alert}
+format-prefix = " "
+format-prefix-foreground = ${res/colors.alert}
 interval = 60
 
-label-padding = ${res/config.padding}
-label-background = ${res/colors.background}
-
 [module/volume]
 type = internal/volume
-format-volume = <label-volume>
-format-volume-prefix = 
-format-volume-prefix-padding = ${res/config.padding}
-format-volume-prefix-foreground = ${res/colors.background}
-format-volume-prefix-background = ${res/colors.icon-volume}
+format-volume = <ramp-volume> <label-volume>
 format-muted = <label-muted>
 
-label-volume-padding = ${res/config.padding}
-label-volume-background = ${res/colors.background}
+label-muted = 
+label-muted-foreground = ${res/colors.background-alt}
 
-label-muted = 
-label-muted-padding = ${res/config.padding}
-label-muted-foreground = ${res/colors.background}
-label-muted-background = ${res/colors.background-alt}
+ramp-volume-0 = 
+ramp-volume-1 = 
+ramp-volume-2 = 
+ramp-volume-foreground = ${res/colors.icon-volume}
 
 [module/wlan]
 type = internal/network
-format-connected = <ramp-signal><label-connected>
+format-connected = <label-connected>
+format-connected-prefix = " "
+format-connected-prefix-foreground = ${res/colors.icon-wlan}
 format-disconnected = <label-disconnected>
 interface = wlp1s0
 
 label-connected = %essid%
-label-connected-padding = ${res/config.padding}
-label-connected-background = ${res/colors.background}
-label-disconnected = 
-label-disconnected-padding = ${res/config.padding}
-label-disconnected-foreground = ${res/colors.background}
-label-disconnected-background = ${res/colors.background-alt}
-
-ramp-signal-0 = 
-ramp-signal-1 = 
-ramp-signal-2 = 
-ramp-signal-3 = 
-ramp-signal-4 = 
-ramp-signal-padding = ${res/config.padding}
-ramp-signal-foreground = ${res/colors.background}
-ramp-signal-background = ${res/colors.icon-wlan}
+label-disconnected = 
+label-disconnected-foreground = ${res/colors.background-alt}
 
 [module/xbacklight]
 type = internal/xbacklight
 format = <label>
-format-prefix = 
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.background}
-format-prefix-background = ${res/colors.icon-xbacklight}
+format-prefix = " "
+format-prefix-foreground = ${res/colors.icon-xbacklight}
 
 label = %percentage%%
-label-padding = ${res/config.padding}
-label-background = ${res/colors.background}
 
 [module/xwindow]
 type = internal/xwindow
 label = %title%
-label-padding = ${res/config.padding}
-label-background = ${res/colors.background}
 label-maxlen = 75
 label-ellipsis = true
 
diff --git a/.config/polybar/start.sh b/.config/polybar/start.sh
index 568e6438..85c4bc1c 100755
--- a/.config/polybar/start.sh
+++ b/.config/polybar/start.sh
@@ -21,7 +21,8 @@ if [[ $PB_MONITOR == "" ]]; then
 	exit 1
 fi
 printf '[INFO] Starting Polybar primary on monitor $PB_MONITOR'
-polybar -r primary-top&
+polybar -r primary-top-left&
+polybar -r primary-top-right&
 # ...and then moving on to secondaries, if we have them
 # Alright, now this looks *really* bad, spawning so many subprocesses, but
 # there's no way in hell you can get me to attempt to solve this with regex.