diff --git a/.config/i3/config b/.config/i3/config
index 7232f975..6c84472e 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -30,7 +30,7 @@ workspace $w7 output $monsec
 font pango:Roboto 10
 new_window pixel 4
 focus_on_window_activation none
-gaps inner 6
+gaps inner 4
 
 set $red #ed1515
 set $green #11d116
diff --git a/.config/polybar/config b/.config/polybar/config
index c3d85675..6731c2d4 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -28,6 +28,10 @@ border = #31363b
 selection = #1d99f3
 
 [res/config]
+bar-width = 50
+bar-fill = |
+bar-empty = |
+bar-indicator = 
 border-size = 4
 padding = 2
 
@@ -45,35 +49,47 @@ background = ${res/colors.bg}
 foreground = ${res/colors.fg}
 border-color = ${res/colors.border}
 tray-background = ${res/colors.bg}
-height = 48
+height = 32
 width = 100%:-12
 offset-x = 6
+padding = 2
 border-left-size = ${res/config.border-size}
 border-right-size = ${res/config.border-size}
-font-0 = "Inconsolata:style=Medium:size=11;2"
-font-1 = "Deja Vu Sans Mono:style=Regular:size=11;2"
+font-0 = "Roboto:style=Regular:size=10;2"
+font-1 = "Deja Vu Sans Mono:style=Regular:size=10;2"
 
 [bar/primary]
 monitor = ${env:PB_MONITOR:eDP-1}
+bottom = false
+inherit = template/bar
+border-bottom-size = ${res/config.border-size}
+modules-left = i3
+modules-center = xwindow
+
+[bar/primary-2]
+monitor = ${env:PB_MONITOR:eDP-1}
 inherit = template/bar
 border-top-size = ${res/config.border-size}
-modules-left = i3 cpu memory battery temp
-modules-right = backlight pulse date
+modules-left = battery cpu memory
+modules-right = backlight pulse | date
 
 ## MODULES
+[module/|]
+type = custom/text
+content = |
+content-foreground = ${res/colors.gray}
+
 [module/backlight]
 type = internal/xbacklight
-format = <ramp> <label>
-label = %percentage:3%%
-ramp-foreground = ${res/colors.yellow}
-ramp-0 = ▁
-ramp-1 = ▂
-ramp-2 = ▃
-ramp-3 = ▄
-ramp-4 = ▅
-ramp-5 = ▆
-ramp-6 = ▇
-ramp-7 = █
+format = <bar>
+format-prefix = "BRI: "
+format-prefix-foreground = ${res/colors.blue}
+bar-width = ${res/config.bar-width}
+bar-fill = ${res/config.bar-fill}
+bar-fill-foreground = ${res/colors.blue}
+bar-empty = ${res/config.bar-empty}
+bar-empty-foreground = ${res/colors.gray}
+bar-indicator = ${res/config.bar-indicator}
 
 [module/battery]
 type = internal/battery
@@ -81,42 +97,33 @@ full-at = 100
 time-format = %H:%M
 interval = 15
 
-format-charging = <ramp-capacity> <label-charging>
-format-discharging = <ramp-capacity> <label-discharging>
-format-full = <ramp-capacity> <label-full>
-label-charging = %percentage:3%%
-label-discharging = %percentage:3%%
-ramp-capacity-foreground = ${res/colors.green}
-ramp-capacity-0 = ▁
-ramp-capacity-0-foreground = ${res/colors.red}
-ramp-capacity-1 = ▂
-ramp-capacity-1-foreground = ${res/colors.red}
-ramp-capacity-2 = ▃
-ramp-capacity-3 = ▄
-ramp-capacity-4 = ▅
-ramp-capacity-5 = ▆
-ramp-capacity-6 = ▇
-ramp-capacity-7 = █
+format-charging = <bar-capacity>
+format-charging-prefix = "Charging: "
+format-charging-prefix-foreground = ${res/colors.green}
+format-discharging = <bar-capacity>
+format-discharging-prefix = "Battery: "
+format-discharging-prefix-foreground = ${res/colors.green}
+format-full = <bar-capacity>
+bar-capacity-width = ${res/config.bar-width}
+bar-capacity-fill = ${res/config.bar-fill}
+bar-capacity-fill-foreground = ${res/colors.green}
+bar-capacity-empty = ${res/config.bar-empty}
+bar-capacity-empty-foreground = ${res/colors.gray}
+bar-capacity-indicator = ${res/config.bar-indicator}
 
 [module/cpu]
 type = internal/cpu
 interval = 1
 
-format = <ramp-coreload> <label>
-label = %percentage:3%%
-ramp-coreload-foreground = ${res/colors.blue}
-ramp-coreload-spacing = 1
-ramp-coreload-0 = ▁
-ramp-coreload-1 = ▂
-ramp-coreload-2 = ▃
-ramp-coreload-3 = ▄
-ramp-coreload-4 = ▅
-ramp-coreload-5 = ▆
-ramp-coreload-5-foreground = ${res/colors.yellow}
-ramp-coreload-6 = ▇
-ramp-coreload-6-foreground = ${res/colors.yellow}
-ramp-coreload-7 = █
-ramp-coreload-7-foreground = ${res/colors.red}
+format = <bar-load>
+format-prefix = "CPU: "
+format-prefix-foreground = ${res/colors.blue}
+bar-load-width = ${res/config.bar-width}
+bar-load-fill = ${res/config.bar-fill}
+bar-load-fill-foreground = ${res/colors.blue}
+bar-load-empty = ${res/config.bar-empty}
+bar-load-empty-foreground = ${res/colors.gray}
+bar-load-indicator = ${res/config.bar-indicator}
 
 [module/date]
 type = internal/date
@@ -149,66 +156,34 @@ label-visible-padding = ${res/config.padding}
 [module/memory]
 type = internal/memory
 
-format = <ramp-used> <ramp-swap-used> <label>
+format = <bar-used> <label>
+format-prefix = "Memory: "
+format-prefix-foreground = ${res/colors.magenta}
 label = %gb_free:8%
-ramp-used-foreground = ${res/colors.magenta}
-ramp-used-0 = ▁
-ramp-used-1 = ▂
-ramp-used-2 = ▃
-ramp-used-3 = ▄
-ramp-used-4 = ▅
-ramp-used-5 = ▆
-ramp-used-5-foreground = ${res/colors.yellow}
-ramp-used-6 = ▇
-ramp-used-6-foreground = ${res/colors.yellow}
-ramp-used-7 = █
-ramp-used-7-foreground = ${res/colors.red}
-ramp-swap-used-foreground = ${res/colors.magenta}
-ramp-swap-used-0 = ▁
-ramp-swap-used-1 = ▂
-ramp-swap-used-2 = ▃
-ramp-swap-used-3 = ▄
-ramp-swap-used-4 = ▅
-ramp-swap-used-5 = ▆
-ramp-swap-used-5-foreground = ${res/colors.yellow}
-ramp-swap-used-6 = ▇
-ramp-swap-used-6-foreground = ${res/colors.yellow}
-ramp-swap-used-7 = █
-ramp-swap-used-7-foreground = ${res/colors.red}
+bar-used-width = ${res/config.bar-width}
+bar-used-fill = ${res/config.bar-fill}
+bar-used-fill-foreground = ${res/colors.magenta}
+bar-used-empty = ${res/config.bar-empty}
+bar-used-empty-foreground = ${res/colors.gray}
+bar-used-indicator = ${res/config.bar-indicator}
 
 [module/pulse]
 type = internal/pulseaudio
-format-volume = <ramp-volume> <label-volume>
-format-muted = <ramp-volume> <label-muted>
-format-muted-foreground = ${res/colors.red}
+format-volume = <bar-volume> <label-volume>
+format-volume-prefix = "Volume: "
+format-volume-foreground = ${res/colors.blue}
+format-muted = <bar-volume> <label-muted>
+format-muted-prefix = "Volume: "
+format-muted-prefix-foreground = ${res/colors.blue}
 label-muted = %percentage%%
-label-muted-foreground = ${res/colors.red}
-ramp-volume-foreground = ${res/colors.cyan}
-ramp-volume-0 = ▁
-ramp-volume-1 = ▂
-ramp-volume-2 = ▃
-ramp-volume-3 = ▄
-ramp-volume-4 = ▅
-ramp-volume-5 = ▆
-ramp-volume-6 = ▇
-ramp-volume-7 = █
+label-muted-foreground = ${res/colors.gray}
+bar-volume-width = ${res/config.bar-width}
+bar-volume-fill = ${res/config.bar-fill}
+bar-volume-fill-foreground = ${res/colors.blue}
+bar-volume-empty = ${res/config.bar-empty}
+bar-volume-empty-foreground = ${res/colors.gray}
+bar-volume-indicator = ${res/config.bar-indicator}
 
-[module/temp]
-type = internal/temperature
-units = true
-warn-temperature = 80
-format = <ramp> <label>
-format-warn = <ramp> <label-warn>
-label = %temperature-c:6%
-label-warn = %temperature-c:6%
-label-warn-foreground = ${res/colors.red}
-ramp-foreground = ${res/colors.yellow}
-ramp-0 = ▁
-ramp-1 = ▂
-ramp-2 = ▃
-ramp-3 = ▄
-ramp-4 = ▅
-ramp-5 = ▆
-ramp-6 = ▇
-ramp-7 = █
-ramp-7-foreground = ${res/colors.red}
+[module/xwindow]
+type = internal/xwindow
+label = %title:40%