diff --git a/.config/polybar/config b/.config/polybar/config
index 7301b382..7235c82a 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -75,9 +75,9 @@ tray-padding = 0
 border-bottom-size = 0
 border-bottom-color = ${res/colors.primary}
 
-modules-left = i3 bspwm || wlan-network eth || wlan-speed cpu-label memory-label || temperature-ramp
-modules-center = xwindow
-modules-right =  mpd || xbacklight-label volume-ramp battery-ramp || date
+modules-left = i3 bspwm | wlan-network eth-network | cpu-label memory-label | temperature-ramp
+modules-center = xwindow-label
+modules-right =  mpd | xbacklight-label volume-ramp battery-ramp | date
 
 ;========================================
 ; MODULES
@@ -87,11 +87,6 @@ modules-right =  mpd || xbacklight-label volume-ramp battery-ramp || date
 ;====================
 [module/|]
 type = custom/text
-content = " "
-content-foreground = ${res/colors.foreground}
-
-[module/||]
-type = custom/text
 content = |
 content-foreground = ${res/colors.background-4}
 
@@ -242,36 +237,6 @@ label-urgent-padding = ${self.label-focused-padding}
 label-urgent-foreground = ${res/colors.background}
 label-urgent-background = ${res/colors.alert}
 
-[module/battery-bar]
-inherit = template/module/battery
-format-charging = <label-charging> <bar-capacity>
-format-discharging = <label-discharging> <bar-capacity>
-format-full = <label-full> <bar-capacity>
-
-label-charging = "+"
-label-charging-padding = ${template/module/bar.label-padding}
-label-charging-foreground = ${template/module/bar.label-foreground}
-label-charging-background = ${res/colors.resource-good-dark}
-label-discharging = "-"
-label-discharging-padding = ${self.label-charging-padding}
-label-discharging-foreground = ${template/module/bar.label-foreground}
-label-discharging-background = ${res/colors.resource-good-dark}
-label-full = "$"
-label-full-padding = ${self.label-charging-padding}
-label-full-foreground = ${template/module/bar.label-foreground}
-label-full-background = ${res/colors.resource-good}
-
-bar-capacity-width = ${template/module/bar.bar-width}
-bar-capacity-fill = ${template/module/bar.bar-fill}
-bar-capacity-fill-foreground = ${template/module/bar.bar-fill-foreground-resource-high}
-bar-capacity-fill-background = ${template/module/bar.bar-fill-background}
-bar-capacity-indicator = ${template/module/bar.bar-indicator}
-bar-capacity-indicator-foreground = ${template/module/bar.bar-indicator-foreground}
-bar-capacity-indicator-background = ${template/module/bar.bar-indicator-background}
-bar-capacity-empty = ${template/module/bar.bar-empty}
-bar-capacity-empty-foreground = ${template/module/bar.bar-empty-foreground}
-bar-capacity-empty-background = ${template/module/bar.bar-empty-background}
-
 [module/battery-ramp]
 inherit = template/module/battery
 format-charging = <animation-charging> <label-charging>
@@ -303,28 +268,6 @@ animation-charging-3 = 
 animation-charging-framerate = 750
 animation-charging-foreground = ${res/colors.primary}
 
-[module/cpu-bar]
-inherit = template/module/cpu
-format = <label> <bar-load>
-
-label = "C"
-label-padding = ${template/module/bar.label-padding}
-label-foreground = ${template/module/bar.label-foreground}
-label-background = ${res/colors.resource-bad-dark}
-
-bar-load-width = ${template/module/bar.bar-width}
-bar-load-fill = ${template/module/bar.bar-fill}
-bar-load-fill-foreground = ${template/module/bar.bar-fill-foreground-resource-low}
-bar-load-fill-background = ${template/module/bar.bar-fill-background}
-bar-load-indicator = ${template/module/bar.bar-indicator}
-bar-load-indicator-foreground = ${template/module/bar.bar-indicator-foreground}
-bar-load-indicator-background = ${template/module/bar.bar-indicator-background}
-bar-load-empty = ${template/module/bar.bar-empty}
-bar-load-empty-foreground = ${template/module/bar.bar-empty-foreground}
-bar-load-empty-background = ${template/module/bar.bar-empty-background}
-
-interval = 1
-
 [module/cpu-coreload]
 inherit = template/module/cpu
 format = <label> <ramp-coreload>
@@ -402,28 +345,6 @@ bar-used-empty = ${template/module/bar.bar-empty}
 bar-used-empty-foreground = ${template/module/bar.bar-empty-foreground}
 bar-used-empty-background = ${template/module/bar.bar-empty-background}
 
-[module/memory]
-type = internal/memory
-format = <label> <bar-used>
-
-label = "M"
-label-padding = ${template/module/bar.label-padding}
-label-foreground = ${template/module/bar.label-foreground}
-label-background = ${res/colors.resource-bad-dark}
-
-bar-used-width = ${template/module/bar.bar-width}
-bar-used-fill = ${template/module/bar.bar-fill}
-bar-used-fill-foreground = ${template/module/bar.bar-fill-foreground-resource-low}
-bar-used-fill-background = ${template/module/bar.bar-fill-background}
-bar-used-indicator = ${template/module/bar.bar-indicator}
-bar-used-indicator-foreground = ${template/module/bar.bar-indicator-foreground}
-bar-used-indicator-background = ${template/module/bar.bar-indicator-background}
-bar-used-empty = ${template/module/bar.bar-empty}
-bar-used-empty-foreground = ${template/module/bar.bar-empty-foreground}
-bar-used-empty-background = ${template/module/bar.bar-empty-background}
-
-interval = 1
-
 [module/memory-label]
 type = internal/memory
 format = <label>
@@ -486,22 +407,8 @@ inherit = module/mpd
 format-online = <icon-random> <icon-repeat>
 label-offline = 
 
-[module/temperature]
-inherit = template/module/temperature
-format = <label>
-format-warn = <label-warn>
-
-label = %temperature%
-label-padding = 0
-label-foreground = ${res/colors.background}
-label-background = ${res/colors.primary-dark}
-label-warn = %temperature%
-label-warn-padding = ${self.label-padding}
-label-warn-foreground = ${res/colors.background}
-label-warn-background = ${res/colors.alert}
-
 [module/temperature-ramp]
-inherit = module/temperature
+inherit = template/module/temperature
 
 format = <ramp> <label>
 format-warning = <ramp> <label>
@@ -522,33 +429,6 @@ ramp-3 = 
 ramp-4 = 
 ;ramp-0 = 
 
-[module/volume-bar]
-type = internal/volume
-format-volume = <label-volume> <bar-volume>
-format-muted = <label-muted> <bar-volume>
-
-label-volume = "V"
-label-volume-padding = ${template/module/bar.label-padding}
-label-volume-foreground = ${template/module/bar.label-foreground}
-label-volume-background = ${template/module/bar.label-background}
-label-muted = "V"
-label-muted-padding = ${self.label-volume-padding}
-label-muted-foreground = ${res/colors.background}
-label-muted-background = ${res/colors.background-4}
-
-bar-volume-width = ${template/module/bar.bar-width}
-bar-volume-fill = ${template/module/bar.bar-fill}
-bar-volume-fill-foreground = ${template/module/bar.bar-fill-foreground-setting}
-bar-volume-fill-background = ${template/module/bar.bar-fill-background}
-bar-volume-indicator = ${template/module/bar.bar-indicator}
-bar-volume-indicator-foreground = ${template/module/bar.bar-indicator-foreground}
-bar-volume-indicator-background = ${template/module/bar.bar-indicator-background}
-bar-volume-empty = ${template/module/bar.bar-empty}
-bar-volume-empty-foreground = ${template/module/bar.bar-empty-foreground}
-bar-volume-empty-background = ${template/module/bar.bar-empty-background}
-
-interval = 1
-
 [module/volume-ramp]
 type = internal/volume
 format-volume = <ramp-volume> <label-volume>
@@ -569,7 +449,7 @@ ramp-volume-2 = 
 
 [module/wlan-network]
 inherit = template/module/network
-label-connected =  %signal%% (%essid%)
+label-connected =  %essid%
 label-connected-foreground = ${res/colors.primary}
 label-connected-background = ${res/colors.background}
 label-disconnected =  %ifname%
@@ -582,7 +462,7 @@ label-connected =  %upspeed%  %downspeed%
 label-connected-foreground = ${res/colors.foreground}
 label-connected-background = ${res/colors.background}
 
-[module/eth]
+[module/eth-network]
 type = internal/network
 inherit = module/wlan-network
 interface = enp0s31f6
@@ -590,14 +470,6 @@ label-connected =  %upspeed%  %downspeed%
 label-connected-foreground = ${res/colors.primary-dark}
 label-disconnected = 
 
-[module/backlight]
-type = internal/backlight
-inherit = template/module/bar
-card = acpi_video0
-
-label = B
-bar-fill-foreground = ${template/module/bar.bar-fill-foreground-setting}
-
 [module/xbacklight-label]
 type = internal/xbacklight
 format = <label>
@@ -606,21 +478,16 @@ label =  %percentage%%
 label-foreground = ${res/colors.foreground}
 label-background = ${res/colors.background}
 
-[module/xkeyboard]
+[module/xkeyboard-label]
 type = internal/xkeyboard
-format = <label-indicator><label-layout>
-
-label-layout = %name%
-label-layout-padding = 0
-label-layout-background = ${res/colors.primary-dark}
-label-layout-foreground = ${res/colors.background}
+format = <label-indicator>
 
 label-indicator = %name%
 label-indicator-padding = 0
-label-indicator-background = ${res/colors.primary}
-label-indicator-foreground = ${self.label-layout-foreground}
+label-indicator-background = ${res/colors.background}
+label-indicator-foreground = ${res/colors.primary}
 
-[module/xwindow]
+[module/xwindow-label]
 type = internal/xwindow
 label = %title%
 label-maxlen = 75