diff --git a/.config/polybar/config b/.config/polybar/config
index 754092f..646e61b 100755
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -44,13 +44,38 @@ format-margin =
 format-offset =
 
 [colors]
-; Nord theme ============
+; DoomOne ============
 background = #282c34
-foreground = #abb2bf
-alert = #bd2c40
-volume-min = #a3be8c
-volume-med = #ebcb8b
-volume-max = #bf616a
+foreground = #bbc2cf
+color0 =       #1c1f24
+color1 =       #ff6c6b
+color2 =       #98be65
+color3 =       #da8548
+color4 =       #51afef
+color5 =       #c678dd
+color6 =       #5699af
+color7 =       #202328
+color8 =       #5b6268
+color9 =       #da8548
+color10 =      #4db5bd
+color11 =      #ecbe7b
+color12 =      #3071db
+color13 =      #a9a1e1
+color14 =      #46d9ff
+color15 =      #dfdfdf
+
+alert = #ff6c6b
+volume-min = #98be65
+volume-med = #ecbe7b
+volume-max = #ff6c6b
+
+; Nord theme ============
+; background = #282c34
+; foreground = #abb2bf
+; alert = #bd2c40
+; volume-min = #a3be8c
+; volume-med = #ebcb8b
+; volume-max = #bf616a
 ; =======================
 
 ; Gotham theme ==========
@@ -435,6 +460,7 @@ monitor = ${env:MONITOR}
 ;monitor-fallback = HDMI1
 monitor-strict = false
 override-redirect = false
+wm-restack = generic
 width = 100%
 height = 22
 ;offset-x = 1%
@@ -474,9 +500,9 @@ font-2 = "Font Awesome 6 Free:style=Regular:pixelsize=8;1"
 font-3 = "Font Awesome 6 Free:style=Solid:pixelsize=8;1"
 font-4 = "Font Awesome 6 Brands:pixelsize=8;1"
 
-modules-left = xmonad xwindow
+modules-left = ewmh
 modules-center =
-modules-right = arrow1 networkspeedup networkspeeddown arrow2 memory2 arrow3 cpu2 arrow2 pavolume arrow3 arch-aur-updates arrow2 date
+modules-right = kernel networkspeed memory2 cpu2 pavolume arch-aur-updates date
 
 tray-detached = false
 tray-offset-x = 0
@@ -789,11 +815,13 @@ type = custom/script
 exec = ~/.config/polybar/scripts/check-all-updates.sh
 interval = 1000
 label = Updates: %output%
-format-foreground = #fefefe
-format-background = #8d62ad
 format-prefix = "🗘 "
-format-prefix-foreground = #fefefe
-
+format-prefix-foreground = ${colors.color5}
+format-foreground = ${colors.color5}
+format-background = ${colors.background}
+format-underline = ${colors.color5}
+format-margin = 2
+format-padding = 0
 
 [module/aur-updates]
 type = custom/script
@@ -866,7 +894,7 @@ format-charging = <animation-charging> <label-charging>
 label-charging =  %percentage%%
 format-charging-foreground = ${colors.foreground}
 format-charging-background = ${colors.background}
-format-charging-underline = #a3c725
+format-chaging-underline = #a3c725
 
 format-discharging = <ramp-capacity> <label-discharging>
 label-discharging =  %percentage%%
@@ -970,12 +998,8 @@ type = internal/cpu
 ; Seconds to sleep between updates
 ; Default: 1
 interval = 1
-format-foreground = #fefefe
-format-background = #8d62ad
 format-prefix = "💻 "
-format-prefix-foreground = #fefefe
-
-label-font = 1
+format-prefix-foreground = ${colors.color14}
 
 ; Available tags:
 ;   <label> (default)
@@ -983,6 +1007,12 @@ label-font = 1
 ;   <ramp-load>
 ;   <ramp-coreload>
 format = <label>
+format-foreground = ${colors.color14}
+format-background = ${colors.background}
+format-underline = ${colors.color14}
+format-margin = 2
+format-padding = 0
+label-font = 1
 
 
 ; Available tokens:
@@ -1005,9 +1035,12 @@ date-alt = " %a %b %d, %Y"
 time = %l:%M%p
 time-alt = %l:%M%p
 format-prefix = "📅 "
-format-prefix-foreground = #fefefe
-format-foreground = #fefefe
-format-background = #668bd7
+format-prefix-foreground = ${colors.color4}
+format-foreground = ${colors.color4}
+format-background = ${colors.background}
+format-underline = ${colors.color4}
+format-margin = 2
+format-padding = 0
 label = "%date% %time% "
 
 #################################################################
@@ -1015,9 +1048,9 @@ label = "%date% %time% "
 [module/ewmh]
 type = internal/xworkspaces
 
-pin-workspaces = false
+pin-workspaces = true
 enable-click = true
-enable-scroll = true
+enable-scroll = false
 reverse-scroll = true
 
 ;extra icons to choose from
@@ -1122,12 +1155,13 @@ type = custom/script
 exec = uname -r
 tail = false
 interval = 1024
-
-format-foreground = ${colors.foreground}
+format-prefix = " 🤖 "
+format-prefix-foreground = ${colors.color13}
+format-foreground = ${colors.color13}
 format-background = ${colors.background}
-format-prefix = "  "
-format-prefix-foreground = #0084FF
-format-underline = #4B5665
+format-underline = ${colors.color13}
+format-margin = 2
+format-padding = 0
 
 ################################################################################
 
@@ -1207,9 +1241,13 @@ label-active-font = 2
 
 format = Mem <label>
 format-prefix = "💾 "
-format-prefix-foreground = #fefefe
-format-foreground = #fefefe
-format-background = #668bd7
+format-prefix-foreground = ${colors.color11}
+format-foreground = ${colors.color11}
+format-background = ${colors.background}
+format-underline = ${colors.color11}
+format-margin = 2
+format-padding = 0
+
 
 ################################################################################
 
@@ -1260,6 +1298,27 @@ bar-progress-fill-background = ${colors.background}
 bar-progress-indicator-foreground = ${colors.foreground}
 format-online-foreground = ${colors.foreground}
 format-online-background = ${colors.background}
+
+################################################################################
+
+[module/networkspeed]
+;https://github.com/jaagr/polybar/wiki/Module:-network
+type = internal/network
+;interface = wlp3s0
+;interface = enp14s0
+;interface = enp0s31f6
+interface = enp6s0
+label-connected = "%upspeed:7%   ↓ %downspeed:7%"
+format-connected = <label-connected>
+format-connected-prefix = "↑ "
+format-connected-prefix-foreground = ${colors.color2}
+format-connected-foreground = ${colors.color2}
+format-connected-background = ${colors.background}
+format-connected-underline = ${colors.color2}
+format-connected-margin = 2
+format-connected-padding = 0
+
+
 ################################################################################
 
 [module/networkspeedup]
@@ -1268,13 +1327,13 @@ type = internal/network
 ;interface = wlp3s0
 ;interface = enp14s0
 ;interface = enp0s31f6
-interface = enp5s0
+interface = enp6s0
 label-connected = "%upspeed:7%"
 format-connected = <label-connected>
 format-connected-prefix = "↑ "
-format-connected-prefix-foreground = #fefefe
-format-connected-foreground = #fefefe
-format-connected-background = #8d62a9
+format-connected-prefix-foreground = ${colors.color6}
+format-connected-foreground = ${colors.color6}
+format-connected-background = ${colors.background}
 
 ################################################################################
 
@@ -1284,13 +1343,14 @@ type = internal/network
 ;interface = wlp3s0
 ;interface = enp14s0
 ;interface = enp0s31f6
-interface = enp5s0
+interface = enp6s0
 label-connected = "%downspeed:7%"
 format-connected = <label-connected>
 format-connected-prefix = "  ↓ "
-format-connected-prefix-foreground = #fefefe
-format-connected-foreground = #fefefe
-format-connected-background = #8d62ad
+format-connected-prefix-foreground = ${colors.color6}
+format-connected-foreground = ${colors.color6}
+format-connected-background = ${colors.background}
+format-connected-margin = 6
 
 ################################################################################
 
@@ -1313,14 +1373,17 @@ type = custom/script
 tail = true
 label = %output%
 format-prefix = " 🔊 "
+format-prefix-foreground = ${colors.color1}
 exec = ~/.config/polybar/scripts/pavolume.sh --listen
 click-right = exec pavucontrol
 click-left = ~/.config/polybar/scripts/pavolume.sh --togmute
 scroll-up = ~/.config/polybar/scripts/pavolume.sh --up
 scroll-down = ~/.config/polybar/scripts/pavolume.sh --down
-format-foreground = #fefefe
-format-background = #668bd7
-
+format-foreground = ${colors.color1}
+format-background = ${colors.background}
+format-underline = ${colors.color1}
+format-margin = 2
+format-padding = 0
 
 
 ################################################################################