diff --git a/polybar/config.ini b/polybar/config.ini
index af283f7..a3b9e81 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -30,7 +30,7 @@ background = ${colors.background}
 foreground = ${colors.foreground}
 
 padding-left = 0
-padding-right = 3
+padding-right = 6
 
 module-margin-left = 6
 module-margin-right = 6
@@ -44,7 +44,7 @@ font-2  = "Material Icons:pixelsize=14;3"
 ; Clock text
 font-3  = "Fira Sans:size=12;2"
 ; MPD song name
-font-4  = "Fira Mono:size=7;-1"
+font-4  = "Fira Code:light:size=7;-1"
 ; Specialised icons
 font-5  = "Weather Icons:size=10;1"
 font-6  = "Bar Material Supplements:pixelsize=14;1"
@@ -63,7 +63,7 @@ width = 100%
 
 modules-left   = i3 volume mpd-local
 modules-center = date
-modules-right  = eth wlan battery memory cpu temperature
+modules-right  = memory cpu temperature eth wlan battery
 
 tray-position = right
 tray-padding  = 2
@@ -146,6 +146,7 @@ type = internal/mpd
 ;small-format-online = <toggle>  <icon-prev> %{T9}<bar-progress>%{T-}%{O-50}%{T5}<label-song>%{T-} <icon-next>
 format-online       = <toggle>  %{A1:mpdclient &:}%{T9}<bar-progress>%{T-}%{O-125}%{T5}<label-song>%{T-}%{A}
 small-format-online = <toggle>  %{A1:mpdclient &:}%{T9}<bar-progress>%{T-}%{O-50}%{T5}<label-song>%{T-}%{A}
+ro-format-online = %{T9}<bar-progress>%{T-}%{O-125}%{T5}<label-song>%{T-}
 
 format-stopped            = %{A1:mpdclient &:}%{A}
 format-stopped-foreground = ${colors.foreground-alt}
@@ -161,8 +162,8 @@ icon-pause-foreground = ${colors.foreground-alt}
 icon-next             = 
 icon-next-foreground  = ${colors.foreground-alt}
 
-label-song              = "%artist% - %title%                    "
-label-song-maxlen       = 22
+label-song              = "%title% · %artist%                    "
+label-song-maxlen       = 25
 small-label-song-maxlen = 7
 label-song-ellipsis     = false
 label-song-foreground   = ${colors.foreground}
@@ -229,7 +230,7 @@ card = intel_backlight
 type = internal/cpu
 interval = 3
 ;format-prefix = " "
-format = "%{A1:i3-sensible-terminal -x htop &:}<ramp-coreload>%{A}%{O-22}"
+format = "%{O-22}%{A1:i3-sensible-terminal -x htop &:}<ramp-coreload>%{A}"
 format-foreground = ${colors.foreground-alt}
 format-prefix-foreground = ${colors.foreground-alt}
 
@@ -239,13 +240,17 @@ format-prefix-foreground = ${colors.foreground-alt}
 ;   %percentage-core[1-9]% - load percentage for specific core
 label = %percentage%
 
-ramp-coreload-0 = ▁
+;ramp-coreload-0 = ▁
+ramp-coreload-0 =
 ramp-coreload-0-foreground = #444
-ramp-coreload-1 = ▂
+;ramp-coreload-1 = ▂
+ramp-coreload-1 =
 ramp-coreload-1-foreground = #444
-ramp-coreload-2 = ▃
+;ramp-coreload-2 = ▃
+ramp-coreload-2 =
 ramp-coreload-2-foreground = #444
-ramp-coreload-3 = ▄
+;ramp-coreload-3 = ▄
+ramp-coreload-3 =
 ramp-coreload-3-foreground = #444
 ramp-coreload-4 = ▅
 ramp-coreload-4-foreground = #666
@@ -259,9 +264,42 @@ ramp-coreload-7-foreground = ${colors.foreground-alert}
 [module/memory]
 type = internal/memory
 interval = 3
-format = "<label>"
+format = "%{A1:i3-sensible-terminal -x htop &:}<ramp-used>%{A}"
 format-foreground = ${colors.foreground-alt}
-label = "%{A1:i3-sensible-terminal -x htop &:}%percentage_used:3%%{A}%{O-20}"
+
+ramp-used-0 =
+ramp-used-1 =
+ramp-used-2 =
+ramp-used-3 =
+ramp-used-4 =
+ramp-used-5 =
+ramp-used-6 =
+ramp-used-7 =
+ramp-used-8 =
+ramp-used-9 =
+ramp-used-10 = 50%
+ramp-used-10-foreground = ${self.format-foreground}
+ramp-used-11 = 55%
+ramp-used-11-foreground = ${self.format-foreground}
+ramp-used-12 = 60%
+ramp-used-12-foreground = ${self.format-foreground}
+ramp-used-13 = 65%
+ramp-used-13-foreground = ${self.format-foreground}
+ramp-used-14 = 70%
+ramp-used-14-foreground = ${self.format-foreground}
+ramp-used-15 = 75%
+ramp-used-15-foreground = ${self.format-foreground}
+ramp-used-16 = 80%
+ramp-used-16-foreground = ${self.format-foreground}
+ramp-used-17 = 85%
+ramp-used-17-foreground = ${self.format-foreground}
+ramp-used-18 = %{T3}%{T-} RAM NEARLY FULL
+ramp-used-18-foreground = ${colors.foreground-caution}
+ramp-used-19 = %{T3}%{T-} RAM FULL
+ramp-used-19-foreground = ${colors.foreground-alert}
+ramp-used-20 = %{T3}%{T-} RAM FULL
+ramp-used-20-foreground = ${colors.foreground-alert}
+
 
 [module/temperature]
 type = internal/temperature
@@ -271,19 +309,13 @@ warn-temperature = 80
 interval = 3
 units = false
 
-;format = <ramp> <label>
-format = "%{A1:i3-sensible-terminal -x watch sensors &:}<label>%{A}"
+format =
 format-foreground = ${colors.foreground-alt}
-format-warn = %{T3}%{T-} <label-warn>
+format-warn = "%{O-22}%{A1:i3-sensible-terminal -x watch sensors &:}%{T3}%{T-} <label-warn>%{A}"
 format-warn-foreground = ${colors.foreground-alert}
 
-label = %temperature-c%
-label-warn = ${self.label}
-
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-foreground = ${colors.foreground-alt}
+label = %temperature-c%℃
+label-warn = %temperature-c%℃
 
 [module/wlan]
 type = internal/network
@@ -297,12 +329,11 @@ interval = 3
 ; %{O-18}         go back 18 pixels to the left
 ; <ramp-signal>   show a signal strength icon
 ; This overlays the actual signal strength icon over the dark "full signal" icon
-;format-connected = %{T7}%{F#333}%{F}%{T-}%{O-18}<ramp-signal>  <label-connected>
-format-connected = %{A:i3-sensible-terminal -x nmtui-connect:}%{A3:i3-sensible-terminal -x nmtui:}%{T7}%{F#333}%{F}%{T-}%{O-18}<ramp-signal>%{A}%{A}
+format-connected = %{A:i3-sensible-terminal -x nmtui-connect &:}%{A3:i3-sensible-terminal -x nmtui &:}%{T7}%{F#333}%{F}%{T-}%{O-18}<ramp-signal>%{A}%{A}
 format-connected-foreground = ${colors.foreground-alt}
 label-connected = %essid%
 
-format-disconnected = %{A1:i3-sensible-terminal -x nmtui-connect:}%{A3:i3-sensible-terminal -x nmtui:}<label-disconnected>%{A}%{A}
+format-disconnected = %{A1:i3-sensible-terminal -x nmtui-connect &:}%{A3:i3-sensible-terminal -x nmtui &:}<label-disconnected>%{A}%{A}
 label-disconnected = 
 label-disconnected-foreground = ${colors.foreground-alt}
 
@@ -318,10 +349,6 @@ type = internal/network
 interface = enp4s0
 interval = 3
 
-;format-connected-prefix = " "
-;format-connected-prefix-foreground = ${colors.foreground}
-;label-connected = %local_ip%
-;label-connected = "↑%{T5}%upspeed%%{T-}  %{T5}↓%downspeed%%{T-}"
 label-connected = "%{O-32}"
 
 ;[module/date]
@@ -401,10 +428,8 @@ ramp-capacity-16 = 
 ramp-capacity-17 = 
 ; 90
 ramp-capacity-18 = 
-; 95
-ramp-capacity-19 = 
-; full
-ramp-capacity-20 = 
+; >=95
+ramp-capacity-19 = 
 
 animation-charging-0 = 
 animation-charging-1 = 