diff --git a/polybar/config.ini b/polybar/config.ini
index 58171c1..5c605ab 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -8,15 +8,12 @@
 ;=====================================================
 
 [colors]
-;background = ${xrdb:color0:#222}
 background = #000
 background-alt = #444
-;foreground = ${xrdb:color7:#222}
 foreground = #dfdfdf
 foreground-alt = #777
-primary = #ffb52a
-secondary = #ff4e4e
-alert = #bd2c40
+alert-fg = #ff4e4e
+alert-bg = #bd2c40
 
 [bar/midbard]
 ;enable-ipc = true
@@ -26,20 +23,11 @@ enable-ipc = false
 ;monitor = ${env:MONITOR:HDMI-1}
 width = 100%
 height = 27
-;offset-x = 1%
-;offset-y = 1%
-;radius = 6.0
 fixed-center = true
 
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-;line-size = 3
-;line-color = #f00
-
-;border-size = 4
-;border-color = #00000000
-
 padding-left = 0
 padding-right = 3
 
@@ -55,12 +43,6 @@ font-4 = "Fira Sans:size=12;1"
 font-5 = "Fira Mono:size=10;1"
 font-6 = "Weather Icons:size=10;1"
 font-7 = "Material Wifi Signal strength:pixelsize=14;2"
-;font-3 = unifont:fontformat=truetype:size=8:antialias=false;0
-;font-4 = siji:pixelsize=10;1
-
-;font-0 = "Tamsyn:pixelsize=12;0"
-;font-1 = "Roboto:size=11:weight=bold;2"
-;font-2 = "Noto Sans:size=11;1"
 
 modules-left = i3 mpd-local mpd-online-1 mpd-online-2
 modules-center = date
@@ -68,19 +50,6 @@ modules-right = volume battery cpu memory temperature eth wlan
 
 tray-position = right
 tray-padding = 2
-;tray-transparent = true
-;tray-background = #0063ff
-
-;wm-restack = bspwm
-;wm-restack = i3
-
-;override-redirect = true
-
-;scroll-up = bspwm-desknext
-;scroll-down = bspwm-deskprev
-
-;scroll-up = i3wm-wsnext
-;scroll-down = i3wm-wsprev
 
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -96,15 +65,12 @@ blacklist-0 = num lock
 
 format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
-format-prefix-underline = ${colors.secondary}
 
 label-layout = %layout%
-label-layout-underline = ${colors.secondary}
 
 label-indicator-padding = 2
 label-indicator-margin = 1
 label-indicator-background = ${colors.secondary}
-label-indicator-underline = ${colors.secondary}
 
 [module/filesystem]
 type = internal/fs
@@ -121,14 +87,13 @@ type = internal/bspwm
 
 label-focused = %index%
 label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
 label-focused-padding = 2
 
 label-occupied = %index%
 label-occupied-padding = 2
 
 label-urgent = %index%!
-label-urgent-background = ${colors.alert}
+label-urgent-background = ${colors.alert-bg}
 label-urgent-padding = 2
 
 label-empty = %index%
@@ -146,12 +111,11 @@ wrapping-scroll = false
 
 label-mode-padding = 2
 label-mode-foreground = #000
-label-mode-background = ${colors.primary}
+label-mode-background = #ffb52a
 
 ; focused = Active workspace on focused monitor
 label-focused = "   %index%   "
 label-focused-background = ${module/bspwm.label-focused-background}
-label-focused-underline = ${module/bspwm.label-focused-underline}
 label-focused-padding = ${module/bspwm.label-focused-padding}
 
 ; unfocused = Inactive workspace on any monitor
@@ -161,7 +125,6 @@ label-unfocused-padding = ${module/bspwm.label-occupied-padding}
 ; visible = Active workspace on unfocused monitor
 label-visible = %index%
 label-visible-background = ${self.label-focused-background}
-label-visible-underline = ${self.label-focused-underline}
 label-visible-padding = ${self.label-focused-padding}
 
 ; urgent = Workspace with urgency hint set
@@ -172,20 +135,21 @@ label-urgent-padding = ${module/bspwm.label-urgent-padding}
 [mpd-shared]
 format-online = <toggle>  <icon-prev> <label-song> <icon-next>
 
-;icon-prev  = 
-;icon-stop  = 
-;icon-play  = 
-;icon-pause = 
-;icon-next  = 
-icon-prev  = 
-icon-stop  = 
-icon-play  = 
-icon-pause = 
-icon-next  = 
+icon-prev             = 
+icon-prev-foreground  = ${colors.foreground-alt}
+icon-stop             = 
+icon-stop-foreground  = ${colors.foreground-alt}
+icon-play             = 
+icon-play-foreground  = ${colors.foreground-alt}
+icon-pause            = 
+icon-pause-foreground = ${colors.foreground-alt}
+icon-next             = 
+icon-next-foreground  = ${colors.foreground-alt}
 
-label-song          = %artist% - %title%
-label-song-maxlen   = 25
-label-song-ellipsis = true
+label-song            = %artist% - %title%
+label-song-foreground = ${colors.foreground}
+label-song-maxlen     = 25
+label-song-ellipsis   = true
 
 bar-progress-width     = 45
 bar-progress-indicator = |
@@ -201,15 +165,21 @@ port = 6600
 
 format-online = ${mpd-shared.format-online}
 
-icon-prev  = ${mpd-shared.icon-prev}
-icon-stop  = ${mpd-shared.icon-stop}
-icon-play  = ${mpd-shared.icon-play}
-icon-pause = ${mpd-shared.icon-pause}
-icon-next  = ${mpd-shared.icon-next}
+icon-prev             = ${mpd-shared.icon-prev}
+icon-prev-foreground  = ${mpd-shared.icon-prev-foreground}
+icon-stop             = ${mpd-shared.icon-stop}
+icon-stop-foreground  = ${mpd-shared.icon-stop-foreground}
+icon-play             = ${mpd-shared.icon-play}
+icon-play-foreground  = ${mpd-shared.icon-play-foreground}
+icon-pause            = ${mpd-shared.icon-pause}
+icon-pause-foreground = ${mpd-shared.icon-pause-foreground}
+icon-next             = ${mpd-shared.icon-next}
+icon-next-foreground  = ${mpd-shared.icon-next-foreground}
 
-label-song          = ${mpd-shared.label-song}
-label-song-maxlen   = ${mpd-shared.label-song-maxlen}
-label-song-ellipsis = ${mpd-shared.label-song-ellipsis}
+label-song            = ${mpd-shared.label-song}
+label-song-foreground = ${mpd-shared.label-song-foreground}
+label-song-maxlen     = ${mpd-shared.label-song-maxlen}
+label-song-ellipsis   = ${mpd-shared.label-song-ellipsis}
 
 bar-progress-width     = ${mpd-shared.bar-progress-width}
 bar-progress-indicator = ${mpd-shared.bar-progress-indicator}
@@ -225,15 +195,21 @@ password = ${env:MPD_ONLINE_1_PASS}
 
 format-online = ${mpd-shared.format-online}
 
-icon-prev  = ${mpd-shared.icon-prev}
-icon-stop  = ${mpd-shared.icon-stop}
-icon-play  = ${mpd-shared.icon-play}
-icon-pause = ${mpd-shared.icon-pause}
-icon-next  = ${mpd-shared.icon-next}
+icon-prev             = ${mpd-shared.icon-prev}
+icon-prev-foreground  = ${mpd-shared.icon-prev-foreground}
+icon-stop             = ${mpd-shared.icon-stop}
+icon-stop-foreground  = ${mpd-shared.icon-stop-foreground}
+icon-play             = ${mpd-shared.icon-play}
+icon-play-foreground  = ${mpd-shared.icon-play-foreground}
+icon-pause            = ${mpd-shared.icon-pause}
+icon-pause-foreground = ${mpd-shared.icon-pause-foreground}
+icon-next             = ${mpd-shared.icon-next}
+icon-next-foreground  = ${mpd-shared.icon-next-foreground}
 
-label-song          = ${mpd-shared.label-song}
-label-song-maxlen   = ${mpd-shared.label-song-maxlen}
-label-song-ellipsis = ${mpd-shared.label-song-ellipsis}
+label-song            = ${mpd-shared.label-song}
+label-song-foreground = ${mpd-shared.label-song-foreground}
+label-song-maxlen     = ${mpd-shared.label-song-maxlen}
+label-song-ellipsis   = ${mpd-shared.label-song-ellipsis}
 
 bar-progress-width     = ${mpd-shared.bar-progress-width}
 bar-progress-indicator = ${mpd-shared.bar-progress-indicator}
@@ -249,15 +225,21 @@ password = ${env:MPD_ONLINE_2_PASS}
 
 format-online = ${mpd-shared.format-online}
 
-icon-prev  = ${mpd-shared.icon-prev}
-icon-stop  = ${mpd-shared.icon-stop}
-icon-play  = ${mpd-shared.icon-play}
-icon-pause = ${mpd-shared.icon-pause}
-icon-next  = ${mpd-shared.icon-next}
+icon-prev             = ${mpd-shared.icon-prev}
+icon-prev-foreground  = ${mpd-shared.icon-prev-foreground}
+icon-stop             = ${mpd-shared.icon-stop}
+icon-stop-foreground  = ${mpd-shared.icon-stop-foreground}
+icon-play             = ${mpd-shared.icon-play}
+icon-play-foreground  = ${mpd-shared.icon-play-foreground}
+icon-pause            = ${mpd-shared.icon-pause}
+icon-pause-foreground = ${mpd-shared.icon-pause-foreground}
+icon-next             = ${mpd-shared.icon-next}
+icon-next-foreground  = ${mpd-shared.icon-next-foreground}
 
-label-song          = ${mpd-shared.label-song}
-label-song-maxlen   = ${mpd-shared.label-song-maxlen}
-label-song-ellipsis = ${mpd-shared.label-song-ellipsis}
+label-song            = ${mpd-shared.label-song}
+label-song-foreground = ${mpd-shared.label-song-foreground}
+label-song-maxlen     = ${mpd-shared.label-song-maxlen}
+label-song-ellipsis   = ${mpd-shared.label-song-ellipsis}
 
 bar-progress-width     = ${mpd-shared.bar-progress-width}
 bar-progress-indicator = ${mpd-shared.bar-progress-indicator}
@@ -294,8 +276,6 @@ interval = 2
 format = <ramp-coreload>%{O-80}
 format-foreground = #555
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #f90000
-;label = %percentage:2%%
 
 
 ; Available tokens:
@@ -316,28 +296,9 @@ ramp-coreload-7 = █
 [module/memory]
 type = internal/memory
 interval = 2
-;format = "<bar-used>%{O-24}"
-	format = "%{T6}<label>%{T-}%{O-15}"
-;format-prefix = " "
-;format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #4bffdc
-;label = "%gb_used%"
+format = "%{T6}<label>%{T-}%{O-15}"
 label = "%percentage_used:3%%"
 
-bar-used-indicator =
-bar-used-width = 9
-;bar-used-foreground-0 = #55aa55
-;bar-used-foreground-1 = #557755
-;bar-used-foreground-2 = #f5a70a
-;bar-used-foreground-3 = #ff5555
-bar-used-foreground-0 = ${colors.foreground}
-bar-used-foreground-1 = ${colors.foreground}
-bar-used-foreground-2 = ${colors.foreground}
-bar-used-foreground-3 = ${colors.foreground}
-bar-used-fill = |
-bar-used-empty = |
-bar-used-empty-foreground = #444444
-
 [module/wlan]
 type = internal/network
 interface = wlp5s0
@@ -352,7 +313,6 @@ interval = 3.0
 ; This overlays the actual signal strength icon over the dark "full signal" icon
 format-connected = %{T8}%{F#333}%{F}%{T-}%{O-18}<ramp-signal>  <label-connected>
 format-connected-foreground = ${colors.foreground-alt}
-format-connected-underline = #9f78e1
 label-connected = %essid%
 
 format-disconnected = <label-disconnected>
@@ -372,19 +332,12 @@ type = internal/network
 interface = enp4s0
 interval = 3.0
 
-format-connected-underline = #55aa55
 ;format-connected-prefix = " "
 ;format-connected-prefix-foreground = ${colors.foreground}
 ;label-connected = %local_ip%
 ;label-connected = "↑%{T6}%upspeed%%{T-}  %{T6}↓%downspeed%%{T-}"
 label-connected = "%{O-32}"
 
-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
-
 [module/date]
 type = internal/date
 interval = 5
@@ -397,7 +350,6 @@ time-alt = %a  %Y-%m-%d    %H:%M:%S
 
 format-prefix = 
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #0a6cf5
 
 label = %time%
 
@@ -405,14 +357,9 @@ label = %time%
 type = internal/volume
 
 format-volume = <label-volume> <bar-volume>
-;label-volume = VOL
 label-volume = 
 label-volume-foreground = ${root.foreground}
 
-; " "
-;format-muted-prefix = ""
-;format-muted-foreground = ${colors.foreground-alt}
-; "sound muted"
 label-muted = 
 
 bar-volume-width = 10
@@ -441,16 +388,13 @@ full-at = 98
 ; FIXME
 ;format-charging = <animation-charging> <label-charging>
 format-charging = <label-charging>
-format-charging-underline = #ffb52a
 
 ;format-discharging = <ramp-capacity> <label-discharging>
 format-discharging = <label-discharging>
-format-discharging-underline = ${self.format-charging-underline}
 
 ;format-full-prefix = " "
 format-full-prefix = ""
 format-full-prefix-foreground = ${colors.foreground-alt}
-format-full-underline = ${self.format-charging-underline}
 
 ramp-capacity-0 = 
 ramp-capacity-1 = 
@@ -470,14 +414,11 @@ warn-temperature = 80
 
 ;format = <ramp> <label>
 format = %{T6}<label>%{T-}
-format-underline = #f50a4d
-;format-warn = <label-warn>
 format-warn = "%{T4} %{T6}<label-warn>%{T-}"
-format-warn-underline = ${self.format-underline}
-format-warn-foreground = ${colors.secondary}
+format-warn-foreground = ${colors.alert-fg}
 
 label = %temperature%
-label-warn = %temperature%
+label-warn = ${self.label}
 
 ramp-0 = 
 ramp-1 = 