diff --git a/common/.config/polybar/main-bar.ini b/common/.config/polybar/main-bar.ini
index aed6cf7..d1e5a2c 100644
--- a/common/.config/polybar/main-bar.ini
+++ b/common/.config/polybar/main-bar.ini
@@ -22,7 +22,7 @@ border-bottom-color = ${colors.background}
 
 modules-left = i3 empty-space title
 modules-center = time
-modules-right = empty-space spotify battery backlight empty-space audio empty-space cpu temperature empty-space memory empty-space arrow
+modules-right = empty-space spotify empty-space backlight empty-space audio empty-space cpu empty-space temperature empty-space memory empty-space battery empty-space arrow
 
 cursor-click = pointer
 cursor-scroll = ns-resize
diff --git a/common/.config/polybar/modules.ini b/common/.config/polybar/modules.ini
index c201d77..24223a3 100644
--- a/common/.config/polybar/modules.ini
+++ b/common/.config/polybar/modules.ini
@@ -17,11 +17,16 @@ ws-icon-9 = 10;
 
 format = <label-state> <label-mode>
 
-label-focused-padding = 0
-label-unfocused-padding = 0
-label-visible-padding = 0
+label-focused = %name%
+label-unfocused = %name%
+label-visible = %name%
+label-urgent = %name%
+
+label-focused-padding = 1
+label-unfocused-padding = 1
+label-visible-padding = 1
 label-urgent-padding = 0
-label-separator-padding = 1
+label-separator-padding = 0
 
 label-focused-background = ${colors.pink}
 label-focused-foreground = ${colors.base}
@@ -79,9 +84,9 @@ label = %{A3:st -e tty-clock -cbt -C 4:} %date% %time% %{A}
 type = internal/pulseaudio
 format-volume = %{A3:pavucontrol-qt:} <ramp-volume> <label-volume> %{A}
 label-muted = %{A3:pavucontrol-qt:} 󰖁 0% %{A}
-ramp-volume-0 = 
-ramp-volume-1 = 
-ramp-volume-2 = 
+ramp-volume-0 = ""
+ramp-volume-1 = ""
+ramp-volume-2 = ""
 label-volume-foreground = ${colors.peach}
 format-volume-foreground = ${colors.peach}
 format-muted-foreground = ${colors.red}
@@ -117,7 +122,7 @@ type = custom/script
 exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
 interval = 0.5
 format = <label>
-format-prefix = "󰍛 "
+format-prefix = " 󰍛 "
 label = %output% MB
 
 format-prefix-foreground = ${colors.maroon}
@@ -167,28 +172,28 @@ label-discharging = %percentage%%
 format-discharging-foreground = ${colors.red}
 
 format-full-prefix = "  "
-format-full-prefix-foreground = ${colors.green}
-format-foreground = ${colors.green}
+format-full-prefix-foreground = ${colors.teal}
+format-foreground = ${colors.teal}
 
-label-discharging-foreground = ${colors.green}
-ramp-capacity-foreground = ${colors.green}
-label-charging-foreground = ${colors.green}
+label-discharging-foreground = ${colors.teal}
+ramp-capacity-foreground = ${colors.teal}
+label-charging-foreground = ${colors.teal}
 
 label-padding = 1
 
-ramp-capacity-0 = "  "
-ramp-capacity-1 = "  "
-ramp-capacity-2 = "  "
-ramp-capacity-3 = "  "
-ramp-capacity-4 = "   "
+ramp-capacity-0 = ""
+ramp-capacity-1 = ""
+ramp-capacity-2 = ""
+ramp-capacity-3 = ""
+ramp-capacity-4 = ""
 
-animation-charging-0 = "  "
-animation-charging-1 = "  "
-animation-charging-2 = "  "
-animation-charging-3 = "  "
-animation-charging-4 = "  "
+animation-charging-0 = ""
+animation-charging-1 = ""
+animation-charging-2 = ""
+animation-charging-3 = ""
+animation-charging-4 = ""
 
-animation-charging-foreground = ${colors.green}
+animation-charging-foreground = ${colors.teal}
 animation-charging-framerate = 750
 
 format-charging-padding = 1
@@ -203,7 +208,7 @@ format-prefix = "󰓇 "
 format-prefix-foreground = ${colors.green}
 format-foreground = ${colors.green}
 format = <label>
-exec = python ~/.config/polybar/spotify-status.py -f '{song} | {artist}'
+exec = python ~/.config/polybar/spotify-status.py -f '{song} | {artist} '
 click-left = playerctl --player=spotify play-pause
 click-right = playerctl --player=spotify next
 click-middle = playerctl --player=spotify previous
@@ -221,6 +226,11 @@ label = "%percentage%%"
 foreground = ${colors.mauve}
 
 ; only applies if <ramp> is used
-ramp-0 = "  "
-ramp-1 = "  "
+ramp-0 = "󰃞"
+ramp-1 = "󰃟"
+ramp-2 = "󰃠"
+
+format-prefix-foreground = ${colors.lavender}
+format-label-foreground = ${colors.lavender}
+format-foreground = ${colors.lavender}