diff --git a/.config/polybar/config b/.config/polybar/config
index 2da66120..095e9457 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -26,9 +26,10 @@ foreground = ${xrdb:color15:#ebdbb2}
 foreground-alt = ${xrdb:color8:#928374}
 
 [res/fonts]
-font-0 = "DejaVu Sans:size=10;1"
-font-1 = "Overpass:size=10;1"
-font-2 = "Symbola:size=10;1"
+#font-0 = "DejaVu Sans:size=10;1"
+font-0 = "Overpass:size=9;1"
+font-1 = "FontAwesome:size=10;1"
+font-2 =
 font-3 =
 font-4 =
 
@@ -69,9 +70,9 @@ tray-padding = 2
 border-bottom-size = 0
 border-bottom-color = ${res/colors.primary}
 
-modules-left = i3 | xwindow
-modules-center = date
-modules-right = wlan-up wlan-down | xkeyboard
+modules-left = wlan | cpu-ramp | memory-label || xwindow
+modules-center = i3
+modules-right = volume-ramp temperature-nobox | battery-ramp date
 
 ; LOWER
 ;====================
@@ -97,6 +98,11 @@ type = custom/text
 content = " "
 content-foreground = ${res/colors.foreground}
 
+[module/||]
+type = custom/text
+content = |
+content-foreground = ${res/colors.foreground}
+
 ; CUSTOM
 ;====================
 
@@ -125,6 +131,17 @@ bar-empty = |
 bar-empty-foreground = ${res/colors.background-soft}
 bar-empty-background = ${res/colors.background}
 
+[template/module/battery]
+type = internal/battery
+battery = BAT0
+adapter = AC
+full-at = 95
+interval = 60
+
+[template/module/cpu]
+type = internal/cpu
+interval = 1
+
 [template/module/network]
 type = internal/network
 interface = wlp1s0
@@ -136,12 +153,17 @@ format-disconnected-foreground = ${res/colors.resource-bad}
 format-disconnected-background = ${res/colors.background}
 
 label-connected = %upspeed% %downspeed% - %signal%%
-label-connected-padding = 2
+label-connected-padding = 0
 label-disconnected = 
-label-disconnected-padding = 2
+label-disconnected-padding = 0
 
 interval = 1
 
+[template/module/temperature]
+type = internal/temperature
+thermal-zone = 0
+warn-temperature = 60
+
 ; STOCK
 ;====================
 [module/i3]
@@ -177,11 +199,8 @@ label-urgent-padding = ${self.label-focused-padding}
 label-urgent-foreground = ${res/colors.background}
 label-urgent-background = ${res/colors.alert}
 
-[module/battery]
-type = internal/battery
-battery = BAT0
-adapter = AC
-full-at = 95
+[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>
@@ -210,10 +229,39 @@ 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}
 
-interval = 60
+[module/battery-ramp]
+inherit = template/module/battery
+format-charging = <animation-charging> <label-charging>
+format-discharging = <ramp-capacity> <label-discharging>
+format-full = <ramp-capacity> <label-full>
 
-[module/cpu]
-type = internal/cpu
+label-charging = %percentage%% %time%
+label-charging-padding = 2
+label-charging-foreground = ${res/colors.foreground}
+label-charging-background = ${res/colors.background}
+label-discharging = %percentage%% %time%
+label-discharging-padding = 2
+label-discharging-foreground = ${res/colors.primary}
+label-discharging-background = ${res/colors.background}
+label-full = %percentage%%
+label-full-padding = 2
+label-full-foreground = ${res/colors.primary-dark}
+label-full-background = ${res/colors.background}
+
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-3 = 
+animation-charging-4 = 
+animation-charging-framerate = 750
+
+[module/cpu-bar]
+inherit = template/module/cpu
 format = <label> <bar-load>
 
 label = "C"
@@ -234,6 +282,25 @@ bar-load-empty-background = ${template/module/bar.bar-empty-background}
 
 interval = 1
 
+[module/cpu-ramp]
+inherit = template/module/cpu
+format = <label> <ramp-coreload>
+
+label = 
+label-padding = 2
+label-foreground = ${res/colors.resource-bad}
+label-background = ${res/colors.background}
+
+ramp-coreload-0 = ▁
+ramp-coreload-1 = ▂
+ramp-coreload-2 = ▃
+ramp-coreload-3 = ▄
+ramp-coreload-4 = ▅
+ramp-coreload-5 = ▆
+ramp-coreload-6 = ▇
+ramp-coreload-7 = █
+ramp-coreload-foreground = ${res/colors.resource-bad}
+
 [module/date]
 type = internal/date
 
@@ -302,6 +369,15 @@ bar-used-empty-background = ${template/module/bar.bar-empty-background}
 
 interval = 1
 
+[module/memory-label]
+type = internal/memory
+format = <label>
+
+label =  %gb_used%
+label-padding = 2
+label-foreground = ${res/colors.resource-bad-dark}
+label-background = ${res/colors.background}
+
 [module/mpd]
 type = internal/mpd
 format-online = <label-song> <bar-progress> <label-time>
@@ -335,9 +411,7 @@ bar-progress-empty-background = ${template/module/bar.bar-empty-background}
 interval = 1
 
 [module/temperature]
-type = internal/temperature
-thermal-zone = 0
-warn-temperature = 60
+inherit = template/module/temperature
 format = <label>
 format-warn = <label-warn>
 
@@ -350,7 +424,19 @@ label-warn-padding = ${self.label-padding}
 label-warn-foreground = ${res/colors.background}
 label-warn-background = ${res/colors.alert}
 
-[module/volume]
+[module/temperature-nobox]
+inherit = module/temperature
+
+label =  %temperature%
+label-padding = 2
+label-foreground = ${res/colors.foreground}
+label-background = ${res/colors.background}
+label-warn = %temperature%
+label-warn-padding = ${self.label-padding}
+label-warn-foreground = ${res/colors.background}
+label-warn-background = ${res/colors.alert}
+
+[module/volume-bar]
 type = internal/volume
 format-volume = <label-volume> <bar-volume>
 format-muted = <label-muted> <bar-volume>
@@ -377,18 +463,32 @@ bar-volume-empty-background = ${template/module/bar.bar-empty-background}
 
 interval = 1
 
-[module/wlan-up]
+[module/volume-ramp]
+type = internal/volume
+format-volume = <ramp-volume><label-volume>
+format-muted = <label-muted>
+
+label-volume = %percentage%%
+label-volume-padding = 2
+label-volume-foreground = ${res/colors.foreground}
+label-volume-background = ${res/colors.background}
+label-muted = 
+label-muted-padding = ${self.label-volume-padding}
+label-muted-foreground = ${res/colors.background-soft}
+label-muted-background = ${res/colors.background}
+
+ramp-volume-0 = 
+ramp-volume-1 = 
+ramp-volume-2 = 
+
+[module/wlan]
 inherit = template/module/network
-label-connected = %upspeed%
+label-connected =  %upspeed%  %downspeed%
 label-connected-foreground = ${res/colors.primary}
 label-connected-background = ${res/colors.background}
 label-disconnected = %ifname% Disconnected
-
-[module/wlan-down]
-inherit = template/module/network
-label-connected = %downspeed%
-label-connected-foreground = ${res/colors.primary-dark}
-label-connected-background = ${res/colors.background}
+label-disconnected-foreground = ${res/colors.background}
+label-disconnected-background = ${res/colors.alert}
 
 [module/backlight]
 type = internal/backlight
@@ -400,7 +500,7 @@ bar-fill-foreground = ${template/module/bar.bar-fill-foreground-setting}
 
 [module/xkeyboard]
 type = internal/xkeyboard
-format = <label-indicator>  <label-layout>
+format = <label-indicator><label-layout>
 
 label-layout = %name%
 label-layout-padding = 2