diff --git a/.config/polybar/config b/.config/polybar/config
index ad8c4286..6e1c76de 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -8,26 +8,26 @@
 # RESOURCES
 #========================================
 [res/colors]
-primary = ${xrdb:color4}
-secondary = ${xrdb:color12}
+primary = ${xrdb:color12}
+secondary = ${xrdb:color4}
 alert = ${xrdb:color3}
 warning = ${xrdb:color1}
 
-icon-battery = ${xrdb:color7}
+icon-battery = ${res/colors.primary}
 icon-cpu = ${xrdb:color12}
-icon-date = ${xrdb:color7}
+icon-date = ${res/colors.primary}
 icon-fs = ${xrdb:color10}
 icon-memory = ${xrdb:color13}
-icon-volume = ${xrdb:color7}
+icon-volume = ${res/colors.primary}
 icon-wlan = ${xrdb:color14}
-icon-wm = ${xrdb:color7}
-icon-xbacklight = ${xrdb:color7}
-icon-xwindow = ${xrdb:color7}
+icon-wm = ${xrdb:color12}
+icon-xbacklight = ${res/colors.primary}
+icon-xwindow = ${res/colors.primary}
 
 background = ${xrdb:background}
 background-alt = ${xrdb:color8}
 foreground = ${xrdb:color15}
-foreground-dark = ${xrdb:color0}
+foreground-dark = ${xrdb:color8}
 
 [res/config]
 padding = 2
@@ -53,16 +53,15 @@ height = 30
 wm-restack = ${env:PB_WM_RESTACK:bspwm}
 
 # Module padding and spacing
-module-margin = 1
+module-margin = 2
+padding = 2
 
 # Mild ricing
-background = #00000000
+background = ${res/colors.background}
 foreground = ${res/colors.foreground}
 
-border-top-size = 10
-border-left-size = ${self.border-top-size}
-border-right-size = ${self.border-top-size}
-border-color = #00000000
+border-size = 4
+border-color = #3c3836
 
 # Module fonts
 font-0 = ${res/fonts.font-0}
@@ -102,45 +101,9 @@ content-foreground = ${res/colors.background-alt}
 
 # OTHER
 #====================
-[module/i3]
-type = internal/i3
-format = <label-state><label-mode>
-format-prefix = i3
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.foreground-dark}
-format-prefix-background = ${res/colors.icon-wm}
-enable-scroll = false
-index-sort = true
-pin-workspaces = true
-
-label-mode-padding = ${res/config.padding}
-label-mode-foreground = ${res/colors.background}
-label-mode-background = ${res/colors.icon-wm}
-
-label-focused = %name%
-label-focused-padding = ${res/config.padding}
-label-focused-foreground = ${self.label-mode-foreground}
-label-focused-background = ${res/colors.secondary}
-
-label-visible = ${self.label-focused}
-label-visible-padding = ${res/config.padding}
-label-visible-background = ${res/colors.background-alt}
-
-label-unfocused = ${self.label-focused}
-label-unfocused-padding = ${res/config.padding}
-label-unfocused-background = ${res/colors.background}
-
-label-urgent = ${self.label-focused}
-label-urgent-padding = ${res/config.padding}
-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.foreground-dark}
-format-prefix-background = ${res/colors.icon-wm}
+format = <label-mode>  <label-state>
 enable-scroll = false
 pin-workspaces = true
 
@@ -155,42 +118,26 @@ 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.foreground-dark}
+label-monocle-foreground = ${res/colors.icon-wm}
 label-tiled = 
-label-tiled-padding = ${res/config.padding}
-label-tiled-background = ${res/colors.icon-wm}
-label-tiled-foreground = ${res/colors.foreground-dark}
+label-tiled-foreground = ${res/colors.icon-wm}
 label-fullscreen = 
-label-fullscreen-padding = ${res/config.padding}
-label-fullscreen-background = ${res/colors.icon-wm}
-label-fullscreen-foreground = ${res/colors.foreground-dark}
+label-fullscreen-foreground = ${res/colors.icon-wm}
 label-floating = 
-label-floating-padding = ${res/config.padding}
-label-floating-background = ${res/colors.icon-wm}
-label-floating-foreground = ${res/colors.foreground-dark}
+label-floating-foreground = ${res/colors.icon-wm}
 label-pseudotiled = 
-label-pseudotiled-padding = ${res/config.padding}
-label-pseudotiled-background = ${res/colors.icon-wm}
-label-pseudotiled-foreground = ${res/colors.foreground-dark}
+label-pseudotiled-foreground = ${res/colors.icon-wm}
 label-locked = 
-label-locked-padding = ${res/config.padding}
-label-locked-background = ${res/colors.icon-wm}
-label-locked-foreground = ${res/colors.foreground-dark}
+label-locked-foreground = ${res/colors.icon-wm}
 label-sticky = 
-label-sticky-padding = ${res/config.padding}
-label-sticky-background = ${res/colors.icon-wm}
-label-sticky-foreground = ${res/colors.foreground-dark}
+label-sticky-foreground = ${res/colors.icon-wm}
 label-private = 
-label-private-padding = ${res/config.padding}
-label-private-background = ${res/colors.icon-wm}
-label-private-foreground = ${res/colors.foreground-dark}
+label-private-foreground = ${res/colors.icon-wm}
 
 label-focused = %icon%
 label-focused-padding = ${res/config.padding}
 label-focused-foreground = ${res/colors.background}
-label-focused-background = ${res/colors.secondary}
+label-focused-background = ${res/colors.icon-wm}
 
 label-dimmed = ${self.label-focused}
 label-dimmed-padding = ${res/config.padding}
@@ -199,42 +146,29 @@ 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
 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.foreground-dark}
-label-full-background = ${res/colors.alert}
+label-full-foreground = ${res/colors.alert}
 
 ramp-capacity-0= 
 ramp-capacity-1= 
@@ -245,8 +179,7 @@ ramp-capacity-5= 
 ramp-capacity-6= 
 ramp-capacity-7= 
 ramp-capacity-8= 
-ramp-capacity-padding = ${res/config.padding}
-ramp-capacity-foreground = ${res/colors.foreground-dark}
+ramp-capacity-foreground = ${res/colors.icon-battery}
 
 animation-charging-0 = ${self.ramp-capacity-0}
 animation-charging-1 = ${self.ramp-capacity-1}
@@ -257,94 +190,64 @@ 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.foreground-dark}
-animation-charging-background = ${res/colors.background-alt}
 animation-charging-framerate = 500
+animation-charging-foreground = ${res/colors.icon-battery}
 
 [module/cpu]
 type = internal/cpu
 format = <label>
-format-prefix = 
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.foreground-dark}
-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.foreground-dark}
-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.foreground-dark}
-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.foreground-dark}
-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.foreground-dark}
-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.foreground-dark}
-format-volume-prefix-background = ${res/colors.icon-volume}
+format-volume-prefix = " "
+format-volume-prefix-foreground = ${res/colors.icon-volume}
 format-muted = <label-muted>
 
-label-volume-padding = ${res/config.padding}
-label-volume-background = ${res/colors.background}
-
 label-muted = 
-label-muted-padding = ${res/config.padding}
 label-muted-foreground = ${res/colors.foreground-dark}
-label-muted-background = ${res/colors.background-alt}
 
 [module/wlan]
 type = internal/network
@@ -353,43 +256,30 @@ 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.foreground-dark}
-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.foreground-dark}
-ramp-signal-background = ${res/colors.icon-wlan}
+ramp-signal-foreground = ${res/colors.icon-wlan}
 
 [module/xbacklight]
 type = internal/xbacklight
 format = <label>
-format-prefix = 
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.foreground-dark}
-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
 format = <label>
-format-prefix = 
-format-prefix-padding = ${res/config.padding}
-format-prefix-foreground = ${res/colors.foreground-dark}
-format-prefix-background = ${res/colors.icon-xwindow}
+format-prefix = " "
+format-prefix-foreground = ${res/colors.icon-xwindow}
 label = %title%
-label-padding = ${res/config.padding}
 label-background = ${res/colors.background}
 label-maxlen = 60
 label-ellipsis = true