diff --git a/.config/polybar/config b/.config/polybar/config
index 0e5e9b3..230eba8 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -1,56 +1,53 @@
-=====================================================
-;
-;   To learn more about how to configure Polybar
-;   go to https://github.com/jaagr/polybar
-;
-;   The README contains alot of information
-;
-;=====================================================
-
 [colors]
-;background = ${xrdb:color0:#222}
 background = #222
 background-alt = #444
-;foreground = ${xrdb:color7:#222}
 foreground = #dfdfdf
 foreground-alt = #555
 primary = #ffb52a
 secondary = #e60053
 alert = #bd2c40
+green = #689d6a
+yellow = #fabc2f
+red = #cc241d
 
-[bar/example]
+[bar/base]
 width = 900 ;100%
-height = 27
-;offset-x = 1%
-;offset-y = 1%
+height = 35
 radius = 6.0
 fixed-center = false
 background = ${colors.background}
 foreground = ${colors.foreground}
-
 line-size = 3
 line-color = #f00
-
 border-size = 0
 border-color = #00000000
-
 padding-left = 0
 padding-right = 2
-
 module-margin-left = 1
-module-margin-right = 2
+module-margin-right = 3
+
+font-0 = "Noto Sans:size=14:style=Regular;1"
+font-1 = unifont:fontformat=truetype:size=14:antialias=false;0
+font-2 = FontAwesome:size=14;0
 
-font-0 = FontAwesome:size=11;1
-font-1 = Noto Mono:fontformat=truetype:size=11:antialias=true;1
-font-2 = unifont:size=11;0
 
 wm-restack = i3
 ;override-redirect = true
 scroll-up = i3wm-wsnext
 scroll-down = i3wm-wsprev
 
+
+[bar/laptop]
+monitor = ${env:MONITOR:eDP-1}
+inherit = bar/base
+tray-position = right
+fixed-center = true
+tray-padding = 2
+modules-left = i3 xwindow 
+modules-right = spotify volume cpu memory battery1 date
+
 [bar/example_left]
-inherit = bar/example
+inherit = bar/base
 monitor = ${env:MONITOR:HDMI-0}
 modules-left = i3
 modules-center = xwindow 
@@ -62,22 +59,14 @@ tray-padding = 2
 
 
 [bar/example_right]
-inherit = bar/example
+inherit = bar/base
 monitor = ${env:MONITOR:DP-4}
 modules-left = i3
 
-[bar/example_laptop]
-monitor = ${env:MONITOR:eDP-1}
-inherit = bar/example
-modules-left = i3
-tray-position = right
-tray-padding = 2
-modules-right = spotify volume filesystemroot memory cpu battery1 battery2 date
-modules-center = xwindow
 
 [module/xwindow]
 type = internal/xwindow
-label = %title:0:30:...%
+label = "> %title:0:75:...%"
 
 
 [module/xkeyboard]
@@ -140,15 +129,16 @@ label-mode-foreground = #000
 label-mode-background = ${colors.primary}
 
 label-focused = %icon%
-label-focused-background = ${module/bspwm.label-focused-background}
-label-focused-underline = ${module/bspwm.label-focused-underline}
+label-focused-background = ${colors.green}
+label-focused-underline = ${colors.green}
 label-focused-padding = ${module/bspwm.label-focused-padding}
 
 label-unfocused = %icon%
 label-unfocused-padding = ${module/bspwm.label-occupied-padding}
 
 label-urgent = %icon%
-label-urgent-background = ${module/bspwm.label-urgent-background}
+label-urgent-background = ${colors.red}
+label-urgent-underline = ${colors.red}
 label-urgent-padding = ${module/bspwm.label-urgent-padding}
 
 label-visible = %icon%
@@ -202,29 +192,50 @@ card = intel_backlight
 
 [module/cpu]
 type = internal/cpu
-interval = 2
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #f90000
-label =  %percentage%%
+interval = 0.5
 format = <label> <ramp-coreload>
-ramp-coreload-0 = -
-ramp-coreload-1 = 1
-ramp-coreload-2 = 2
-ramp-coreload-3 = 3
-ramp-coreload-4 = 4
-ramp-coreload-5 = 5
-ramp-coreload-6 = 6
-ramp-coreload-7 = 7
-ramp-coreload-8 = 8
-ramp-coreload-9 = 9
+label = CPU
+ramp-font = 2
+ramp-coreload-0 = ▁
+ramp-coreload-font = 3
+ramp-coreload-0-foreground = ${colors.green}
+ramp-coreload-1 = ▂
+ramp-coreload-1-font = 2
+ramp-coreload-1-foreground = ${colors.green}
+ramp-coreload-2 = ▃
+ramp-coreload-2-font = 2
+ramp-coreload-2-foreground = ${colors.green}
+ramp-coreload-3 = ▄
+ramp-coreload-3-font = 2
+ramp-coreload-3-foreground = ${colors.green}
+ramp-coreload-4 = ▅
+ramp-coreload-4-font = 2
+ramp-coreload-4-foreground = ${colors.yellow}
+ramp-coreload-5 = ▆
+ramp-coreload-5-font = 2
+ramp-coreload-5-foreground = ${colors.yellow}
+ramp-coreload-6 = ▇
+ramp-coreload-6-font = 2
+ramp-coreload-6-foreground = ${colors.red}
+ramp-coreload-7 = █
+ramp-coreload-7-font = 2
+ramp-coreload-7-foreground = ${colors.red}
+
+
 
 [module/memory]
 type = internal/memory
-interval = 2
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #4bffdc
-label =  %percentage_used%%
+format = <label> <bar-used>
+label = MEM
 
+bar-used-indicator =
+bar-used-width = 17
+bar-used-foreground-0 = ${colors.green}
+bar-used-foreground-1 = ${colors.yellow}
+bar-used-foreground-2 = ${colors.red}
+bar-used-fill = ▐
+bar-used-empty = ▐
+bar-used-empty-foreground = #444444
 
 [module/wlan]
 type = internal/network
@@ -268,17 +279,16 @@ format-disconnected =
 type = internal/date
 interval = 1
 
-date = " %d/%m/%y"
-date-alt = " %d/%m/%Y"
+date = %a %d %b %Y%%{F-}
+date-alt = %a %d %b %Y%%{F-}
 
 time = %H:%M
 time-alt = %H:%M:%S
 
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #0a6cf5
 
 label = %time% %date%
-format =  <label>
+format = <label>
 
 [module/volume]
 type = internal/alsa
@@ -298,11 +308,11 @@ bar-volume-foreground-4 = #55aa55
 bar-volume-foreground-5 = #f5a70a
 bar-volume-foreground-6 = #ff5555
 bar-volume-gradient = false
-bar-volume-indicator = X
+bar-volume-indicator = ▐
 bar-volume-indicator-font = 2
-bar-volume-fill = -
+bar-volume-fill = ─
 bar-volume-fill-font = 2
-bar-volume-empty = -
+bar-volume-empty = ─
 bar-volume-empty-font = 2
 bar-volume-empty-foreground = ${colors.foreground-alt}
 
@@ -382,33 +392,29 @@ format =  <label>
 
 [module/battery1]
 type = internal/battery
+full-at = 95
 battery = BAT0
 adapter = ADP1
-full-at = 98
+time-format = %Hh:%Mm
 
-format-charging = <animation-charging> <label-charging>
-format-charging-underline = #ffb52a
+label-charging = %time% full
+format-charging = <label-charging>
 
-format-discharging = <ramp-capacity> <label-discharging>
-format-discharging-underline = ${self.format-charging-underline}
+label-full = Fully charged
+format_full = <label-full>
 
-format-full-prefix = " "
-format-full-prefix-foreground = ${colors.foreground-alt}
-format-full-underline = ${self.format-charging-underline}
+label-discharging = %percentage%% %time% left
+format-discharging = <ramp-capacity> <label-discharging>  
 
 ramp-capacity-0 = 
+ramp-capacity-0-foreground = ${colors.red}
 ramp-capacity-1 = 
+ramp-capacity-1-foreground = ${colors.yellow}
 ramp-capacity-2 = 
+ramp-capacity-2-foreground = ${colors.green}
 ramp-capacity-3 = 
+ramp-capacity-3-foreground = ${colors.green}
 ramp-capacity-4 = 
-<!-- ramp-capacity-foreground = ${colors.foreground-alt} -->
+ramp-capacity-4-foreground = ${colors.green}
 
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-foreground = ${colors.foreground-alt}
-animation-charging-framerate = 750
-
-[module/battery2]
-inherit = module/battery1
-battery = BAT1
+animation-discharging-0 = 
\ No newline at end of file
diff --git a/.config/polybar/polybar.sh b/.config/polybar/polybar.sh
index 28bd7fd..a306f22 100755
--- a/.config/polybar/polybar.sh
+++ b/.config/polybar/polybar.sh
@@ -8,6 +8,6 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 # Launch bar1 and bar2
 polybar -c ~/.config/polybar/config example_left &
 polybar -c ~/.config/polybar/config example_right & 
-polybar -c ~/.config/polybar/config example_laptop &
+polybar -c ~/.config/polybar/config laptop &
 
 echo "Bars launched..."