diff --git a/polybar.conf b/polybar.conf
index 097b740..fb7115e 100644
--- a/polybar.conf
+++ b/polybar.conf
@@ -18,7 +18,8 @@ background-alt = #444
 foreground = #dfdfdf
 foreground-alt = #55
 primary = #ffb52a
-secondary = #e60053
+secondary = #b37504
+red = #e60053
 alert = #bd2c40
 
 [global/wm]
@@ -27,7 +28,7 @@ margin-bottom = 5
 
 [bar/mybar]
 bottom = false
-separator = ""
+separator = "|"
 
 ;monitor = ${env:MONITOR:HDMI-1}
 width = 100%
@@ -35,7 +36,6 @@ height = 27
 offset-x = 0
 offset-y = 0
 
-;background = ${xrdb:color9}
 background = ${colors.background}
 foreground = ${colors.foreground}
 
@@ -68,7 +68,7 @@ font-12 = Symbola:style=Regular
 
 modules-left = suspend-control i3 xwindow
 modules-center =
-modules-right = zoom-audio xbacklight-acpi volume xkeyboard memory cpu wlan battery temperature date powermenu
+modules-right = zoom-audio xbacklight-acpi volume xkeyboard memory cpu wlan battery date powermenu
 
 tray-position = right
 tray-padding = 2
@@ -95,11 +95,11 @@ label = %title:0:30:...%
 type = internal/xkeyboard
 blacklist-0 = num lock
 label-layout = %{F#55}%{F-} %layout%
-label-layout-underline = ${colors.secondary}
+label-layout-underline = ${colors.red}
 label-indicator-padding = 2
 label-indicator-margin = 1
-label-indicator-background = ${colors.secondary}
-label-indicator-underline = ${colors.secondary}
+label-indicator-background = ${colors.red}
+label-indicator-underline = ${colors.red}
 
 [module/filesystem]
 type = internal/fs
@@ -146,28 +146,31 @@ label-mode-padding = 2
 label-mode-foreground = #000
 label-mode-background = ${colors.primary}
 
-label-focused = %name%
-label-focused-background = ${module/bspwm.label-focused-background}
-label-focused-underline = ${module/bspwm.label-focused-underline}
-label-focused-padding = ${module/bspwm.label-focused-padding}
+label-focused = [ %name%.%icon% ]
+label-focused-background = ${colors.background-alt}
+label-focused-underline = ${colors.primary}
+label-focused-padding = 2
 
-label-unfocused = %name%
-label-unfocused-padding = ${module/bspwm.label-occupied-padding}
-
-label-urgent = %name%!
-label-urgent-background = ${module/bspwm.label-urgent-background}
-label-urgent-padding = ${module/bspwm.label-urgent-padding}
-
-label-visible = %name%
+label-visible = %name%.%icon%
 label-visible-background = ${self.label-focused-background}
-label-visible-underline = ${self.label-focused-underline}
-label-visible-padding = ${self.label-focused-padding}
+label-visible-underline = ${colors.secondary}
+label-visible-padding = 2
 
-ws-icon-0 = "1;WWW"
+label-unfocused = %name%.%icon%
+label-unfocused-padding = 2
+
+label-urgent = %name%.%icon%!
+label-urgent-background = ${colors.alert}
+label-urgent-padding = 2
+
+ws-icon-0 = "1;Web"
 ws-icon-1 = "2;Slack"
 ws-icon-2 = "3;Tg"
-ws-icon-3 = "4;"
-ws-icon-default = k
+ws-icon-3 = "6;Web"
+ws-icon-4 = "7;IDEA"
+ws-icon-5 = "0;Sql"
+ws-icon-6 = "8;Term"
+ws-icon-default = 
 
 [module/mpd]
 type = internal/mpd
@@ -359,7 +362,7 @@ format-warn-underline = ${self.format-underline}
 
 label = %temperature-c%
 label-warn = %temperature-c%
-label-warn-foreground = ${colors.secondary}
+label-warn-foreground = ${colors.red}
 
 ramp-0 = 
 ramp-1 = 
@@ -372,9 +375,9 @@ type = custom/menu
 format-spacing = 1
 
 label-open =  ⏻ power
-label-open-foreground = ${colors.secondary}
+label-open-foreground = ${colors.red}
 label-close =  ⏻ cancel
-label-close-foreground = ${colors.secondary}
+label-close-foreground = ${colors.red}
 label-separator = |
 label-separator-foreground = ${colors.foreground-alt}