diff --git a/.config/polybar/colors.ini b/.config/polybar/colors.ini
index d6fc51a..6788f21 100755
--- a/.config/polybar/colors.ini
+++ b/.config/polybar/colors.ini
@@ -1,11 +1,8 @@
 [colors]
 background = #99282a36
-background-alt = #bd93f9
+current-line = #FF44475a
 foreground = #f8f8f2
-foreground-alt = #ff79c6
-primary = #dbdbbd
-secondary = #50fa7b
-alert = #ff5555
+comment = #6272a4
 
 cyan = #8be9fd
 green = #50fa7b
@@ -13,4 +10,9 @@ orange = #ffb86c
 pink = #ff79c6
 purple = #bd93f9
 red = #ff5555
-yellow = #f1fa8c
\ No newline at end of file
+yellow = #f1fa8c
+
+foreground-alt = ${self.foreground}
+background-alt = ${self.background}
+primary = ${self.pink}
+secondary = ${self.green}
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 9a760a4..21683c3 100755
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -83,7 +83,7 @@ radius-bottom = 0.0
 ;   {overline,underline}-size
 ;   {overline,underline}-color
 line-size = 2
-line-color = ${colors.primary}
+line-color = ${colors.pink}
 
 ; Values applied to all borders
 ; Individual side values can be defined using:
@@ -300,7 +300,7 @@ radius-bottom = 0.0
 ;   {overline,underline}-size
 ;   {overline,underline}-color
 line-size = 2
-line-color = ${colors.primary}
+line-color = ${colors.pink}
 
 ; Values applied to all borders
 ; Individual side values can be defined using:
@@ -314,7 +314,7 @@ line-color = ${colors.primary}
 ; following horizontal space on the bar:
 ;   width - border-right-size - border-left-size
 border-size = 0
-border-bottom-color = ${colors.primary}
+border-bottom-color = ${colors.pink}
 
 ; Number of spaces to add at the beginning/end of the bar
 ; Individual side values can be defined using:
diff --git a/.config/polybar/custom/modules.ini b/.config/polybar/custom/modules.ini
index c895f75..c269f8d 100755
--- a/.config/polybar/custom/modules.ini
+++ b/.config/polybar/custom/modules.ini
@@ -1,5 +1,6 @@
 [module/gme]
 type = custom/script
+format-underline = ${colors.pink}
 exec = ~/.config/polybar/custom/scripts/gme.sh
 tail = true
 click-left = kill -USR1 %pid%
\ No newline at end of file
diff --git a/.config/polybar/modules.ini b/.config/polybar/modules.ini
index 0555ac9..a1d9811 100755
--- a/.config/polybar/modules.ini
+++ b/.config/polybar/modules.ini
@@ -13,7 +13,8 @@ time-format = %H:%M
 ;   <bar-capacity>
 ;   <ramp-capacity>
 ;   <animation-charging>
-format-charging = <animation-charging> <label-charging>
+format-charging = <animation-charging>  <label-charging>
+format-charging-underline = ${colors.green}
 
 ; Available tags:
 ;   <label-discharging> (default)
@@ -21,26 +22,28 @@ format-charging = <animation-charging> <label-charging>
 ;   <ramp-capacity>
 ;   <animation-discharging>
 format-discharging = <ramp-capacity>  <label-discharging>
+format-discharging-underline = ${colors.red}
 
 ; Available tags:
 ;   <label-full> (default)
 ;   <bar-capacity>
 ;   <ramp-capacity>
-;format-full = <ramp-capacity> <label-full>
+format-full = <label-full>
+format-full-underline = ${colors.green}
 
 ; Available tokens:
 ;   %percentage% (default) - is set to 100 if full-at is reached
 ;   %percentage_raw%
 ;   %time%
 ;   %consumption% (shows current charge rate in watts)
-label-charging = Charging %percentage%%
+label-charging = %percentage%% %time% remaining
 
 ; Available tokens:
 ;   %percentage% (default) - is set to 100 if full-at is reached
 ;   %percentage_raw%
 ;   %time%
 ;   %consumption% (shows current discharge rate in watts)
-label-discharging = Discharging %percentage%%
+label-discharging = %percentage%% %time% remaining
 
 ; Available tokens:
 ;   %percentage% (default) - is set to 100 if full-at is reached
@@ -75,48 +78,32 @@ animation-discharging-4 = 
 ; Framerate in milliseconds
 animation-discharging-framerate = 500
 
-[module/xwindow]
-type = internal/xwindow
-label = %title:0:30:...%
-
-[module/xkeyboard]
-type = internal/xkeyboard
-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/bspwm]
 type = internal/bspwm
 
 reverse-scroll = false
 
 label-focused = %name%
+label-focused-foreground = ${colors.comment}
 label-focused-background = ${colors.pink}
-focused-foreground = ${colors.foreground}
 label-focused-padding = 1
 
 label-occupied = %name%
+label-occupied-foreground = ${colors.comment}
+label-occupied-background = ${colors.green}
 label-occupied-padding = 1
-label-occupied-foreground = ${colors.green}
 
 label-urgent = %name%!
+label-urgent-foreground = ${colors.foreground}
 label-urgent-background = ${colors.red}
 label-urgent-padding = 1
 
 label-empty = %name%
-label-empty-foreground = ${colors.foreground-alt}
+label-empty-foreground = ${colors.foreground}
 label-empty-padding = 1
+
 label-separator = "|"
+label-separator-foreground = ${colors.cyan}
 label-separator-padding =  0
 
 pin-workspaces = true
@@ -125,50 +112,78 @@ pin-workspaces = true
 type = internal/cpu
 interval = 2
 format-prefix = "  "
-format-prefix-foreground = ${colors.foreground-alt}
+format-prefix-foreground = ${colors.red}
 format-underline = ${colors.red}
 label = %percentage:2%%
-click-left=kitty bpytop
-
-[module/memory]
-type = internal/memory
-interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = ${colors.green}
-label = %percentage_used%%
-click-left=kitty bpytop
-
-[module/wlan]
-type = internal/network
-interface = wlan0
-interval = 3.0
-
-format-connected-underline = ${colors.purple}
-label-connected = "%{T2}%{T-}%upspeed% %{T2}%{T-}%downspeed%"
 
 [module/date]
 type = internal/date
 interval = 5
 
-date =
+date = "%A"
 date-alt = " %Y-%m-%d"
 
 time = %H:%M
 time-alt = %H:%M:%S
 
-format-prefix = 
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #0a6cf5
+format-underline = ${colors.purple}
 
 label = %date% %time%
 
+[module/memory]
+type = internal/memory
+interval = 2
+format-prefix = " "
+format-prefix-foreground = ${colors.green}
+format-underline = ${colors.green}
+
+label = %percentage_used%%
+click-left=kitty bpytop
+
+[module/powermenu]
+type = custom/menu
+
+expand-right = true
+
+format-spacing = 1
+
+label-open = "%{T2}%{T-}  "
+label-open-foreground = ${colors.orange}
+label-close = "%{T2}%{T-} cancel"
+label-close-foreground = ${colors.red}
+label-separator = |
+label-separator-foreground = ${colors.cyan}
+
+menu-0-0 = "%{T2}%{T-}  reboot"
+menu-0-0-exec = menu-open-1
+menu-0-1 = "%{T2}%{T-}  power off"
+menu-0-1-exec = menu-open-2
+menu-0-2 = "%{T2}%{T-} hibernate"
+menu-0-2-exec = menu-open-3
+
+menu-1-0 = "%{T2}%{T-}  reboot"
+menu-1-0-exec = systemctl reboot
+menu-1-1 = cancel
+menu-1-1-exec = menu-open-0
+
+
+menu-2-0 = "%{T2}%{T-}  power off"
+menu-2-0-exec = systemctl poweroff
+menu-2-1 = cancel
+menu-2-1-exec = menu-open-0
+
+menu-3-0 = "%{T2}%{T-} hibernate"
+menu-3-0-exec = systemctl hibernate
+menu-3-1 = cancel
+menu-3-1-exec = menu-open-0
+
+
 [module/pulseaudio]
 type = internal/pulseaudio
 
 format-volume = <label-volume> <bar-volume>
 label-volume =   %percentage%%
-label-volume-foreground = ${root.foreground}
+label-volume-foreground = ${colors.foreground}
 
 label-muted = "%{T2}%{T-} muted"
 label-muted-foreground = ${colors.foreground-alt}
@@ -194,39 +209,17 @@ bar-volume-empty-foreground = ${colors.foreground}
 
 click-middle=pavucontrol
 click-right=~/bin/cycle_sinks.sh
-[module/powermenu]
-type = custom/menu
 
-expand-right = true
+[module/wlan]
+type = internal/network
+interface = wlan0
+interval = 3.0
 
-format-spacing = 1
+format-connected-underline = ${colors.purple}
+label-connected = "%{T2}%{T-}%upspeed% %{T2}%{T-}%downspeed%"
 
-label-open = "%{T2}%{T-}  "
-label-open-foreground = ${colors.foreground-alt}
-label-close = "%{T2}%{T-} cancel"
-label-close-foreground = ${colors.red}
-label-separator = |
-label-separator-foreground = ${colors.foreground-alt}
-
-menu-0-0 = "%{T2}%{T-}  reboot"
-menu-0-0-exec = menu-open-1
-menu-0-1 = "%{T2}%{T-}  power off"
-menu-0-1-exec = menu-open-2
-menu-0-2 = "%{T2}%{T-} hibernate"
-menu-0-2-exec = menu-open-3
-
-menu-1-0 = "%{T2}%{T-}  reboot"
-menu-1-0-exec = systemctl reboot
-menu-1-1 = cancel
-menu-1-1-exec = menu-open-0
-
-
-menu-2-0 = "%{T2}%{T-}  power off"
-menu-2-0-exec = systemctl poweroff
-menu-2-1 = cancel
-menu-2-1-exec = menu-open-0
-
-menu-3-0 = "%{T2}%{T-} hibernate"
-menu-3-0-exec = systemctl hibernate
-menu-3-1 = cancel
-menu-3-1-exec = menu-open-0
+[module/xwindow]
+type = internal/xwindow
+format = <label>
+label = %title:0:30:...%
+format-underline = ${colors.orange}