diff --git a/.config/polybar/colors b/.config/polybar/colors
new file mode 100644
index 0000000..2a0441d
--- /dev/null
+++ b/.config/polybar/colors
@@ -0,0 +1,23 @@
+[colors]
+background = #00000000
+foreground = #dfdfdf
+text = ${xrdb:color15:#ffffff}
+
+
+i3-mode-fg = #000
+i3-mode-bg = #e6e600
+
+i3-focus-ul = #f90000
+i3-focus-bg = #00000000
+
+i3-visable-ul = #ffff00 
+i3-visable-bg = c#00000000
+
+i3-urgent-bg = #3399ff
+
+cpu-ul = #4bffdc
+date-ul = #0a6cf5
+vol-ul = #ff6600
+bat-ul = #ffb52a
+spotify-ul = #00b300
+wg-ul = #00b300
diff --git a/.config/polybar/config b/.config/polybar/config
index a0b2621..6607066 100755
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -13,10 +13,7 @@
 ; - xorg-xrandr (for launch script)
 ; - xrdb (for wal colors)
 
-[colors]
-background = #00000000
-foreground = #dfdfdf
-text = ${xrdb:color15:#ffffff}
+include-file = $HOME/.config/polybar/colors
 
 [bar/main]
 enable-ipc = true
@@ -66,13 +63,13 @@ wrapping-scroll = false
 format-foreground = ${colors.text}
 
 label-mode-padding = 2
-label-mode-foreground = #000
-label-mode-background = #e6e600
+label-mode-foreground = ${colors.i3-mode-fg}
+label-mode-background = ${colors.i3-mode-bg}
 
 ; focused = Active workspace on focused monitor
 label-focused = %index%
-label-focused-background = #00000000
-label-focused-underline = #f90000
+label-focused-background = ${colors.i3-focus-bg}
+label-focused-underline = ${colors.i3-focus-ul}
 label-focused-padding = 2
 
 ; unfocused = Inactive workspace on any monitor
@@ -81,13 +78,13 @@ label-unfocused-padding = 2
 
 ; visible = Active workspace on unfocused monitor
 label-visible = %index%
-label-visible-background = ${self.label-focused-background}
-label-visible-underline = #ffff00 
+label-visible-background = ${colors.i3-visable-bg}
+label-visible-underline = ${colors.i3-visable-ul}
 label-visible-padding = ${self.label-focused-padding}
 
 ; urgent = Workspace with urgency hint set
 label-urgent = %index%
-label-urgent-background = #3399ff
+label-urgent-background = ${colors.i3-urgent-bg}
 label-urgent-padding = 2
 
 
@@ -123,7 +120,7 @@ label = %percentage:2%%
 [module/memory]
 type = internal/memory
 interval = 2
-format-underline = #4bffdc
+format-underline = ${colors.cpu-ul}
 format-foreground = ${colors.text}
 label = %percentage_used%%
 
@@ -148,21 +145,21 @@ time = %H:%M
 time-alt = %H:%M:%S
 
 format-foreground = ${colors.text}
-format-underline = #0a6cf5
+format-underline = ${colors.date-ul}
 
 label = %date% %time%
 
 [module/pulseaudio]
 type = internal/pulseaudio
 
-format-volume-underline = #ff6600
+format-volume-underline = ${colors.vol-ul}
 format-volume = <label-volume> <bar-volume>
 label-volume = %percentage%%
 label-volume-foreground = ${colors.text}
 
 label-muted = muted
 label-muted-foreground = ${colors.text}
-format-muted-underline = #ff6600
+format-muted-underline = ${colors.vol-ul}
 
 bar-volume-width = 10
 bar-volume-foreground-0 = #55aa55
@@ -190,7 +187,7 @@ full-at = 98
 
 format-charging-foreground = ${colors.text}
 format-charging = <label-charging>
-format-charging-underline = #ffb52a
+format-charging-underline = ${colors.bat-ul}
 
 format-discharging-foreground = ${colors.text}
 format-discharging = <label-discharging>
@@ -204,7 +201,7 @@ format-full-underline = ${self.format-charging-underline}
 type = custom/ipc
 
 format-foreground = ${colors.text}
-format-underline = #00b300
+format-underline = ${colors.spotify-ul}
 
 hook-0 = $HOME/.config/polybar/spotifyd-meta.sh
 initial = 1
@@ -213,7 +210,7 @@ initial = 1
 type = custom/ipc
 
 format-foreground = ${colors.text}
-format-underline = #00b300
+format-underline = ${colors.wg-ul}
 
 click-left = $HOME/.config/polybar/wireguard-switch.sh