diff --git a/config/polybar/config b/config/polybar/config
index 6d12fac..a3e89de 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -30,7 +30,7 @@ alert = #bd2c40
 [bar/thebar]
 monitor = ${env:MONITOR:eDP1}
 width = 100%
-height = 23
+height = 24
 ;offset-x = 1%
 ;offset-y = 1%
 ;radius = 6.0
@@ -52,13 +52,12 @@ padding-right = 2
 module-margin-left = 1
 module-margin-right = 2
 
-font-0 = roboto:pixelsize=10;1
+font-0 = fontawesome:pixelsize=10;1
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = roboto:pixelsize=10;1
 
-modules-left = i3
+modules-left = powermenu i3
 #modules-center = mpd
-modules-right = xbacklight pactl xkeyboard memory cpu wlan eth temperature battery date powermenu
+modules-right = cpu memory xbacklight pactl xkeyboard wlan eth temperature battery-combined date mail
 
 tray-position = right
 tray-padding = 2
@@ -87,7 +86,7 @@ label = %title:0:30:...%
 type = internal/xkeyboard
 blacklist-0 = num lock
 
-#format-prefix = " "
+format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 format-prefix-underline = ${colors.secondary}
 
@@ -186,17 +185,17 @@ label-urgent-padding = ${module/bspwm.label-urgent-padding}
 type = internal/xbacklight
 
 format = <label> <bar>
-label = BL
+label = 
 
 bar-width = 5
 bar-indicator = |
 bar-indicator-foreground = #fff
-bar-indicator-font = 2
+bar-indicator-font = 0
 bar-fill = ─
-bar-fill-font = 2
+bar-fill-font = 0
 bar-fill-foreground = #9f78e1
 bar-empty = ─
-bar-empty-font = 2
+bar-empty-font = 0
 bar-empty-foreground = ${colors.foreground-alt}
 
 [module/backlight-acpi]
@@ -207,26 +206,26 @@ card = intel_backlight
 [module/cpu]
 type = internal/cpu
 interval = 2
-#format-prefix = " "
+format-prefix = "CPU "
 format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #f90000
-label = CPU %percentage:2%%
+label = %percentage:2%%
 
 [module/memory]
 type = internal/memory
 interval = 2
-#format-prefix = " "
+format-prefix = "MEM "
 format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #4bffdc
-label = MEM %percentage_used%%
+label = %percentage_used%%
 
 [module/wlan]
 type = internal/network
 interface = wlp4s0
 interval = 3.0
 
-#format-connected = <ramp-signal> <label-connected>
-format-connected = <label-connected>
+format-connected = <ramp-signal> <label-connected>
+#format-connected = <label-connected>
 format-connected-underline = #9f78e1
 label-connected = %essid% (%signal%%) %local_ip%
 
@@ -236,12 +235,12 @@ format-disconnected = no_wifi
 ;label-disconnected = %ifname% disconnected
 ;label-disconnected-foreground = ${colors.foreground-alt}
 
-#ramp-signal-0 = 
-#ramp-signal-1 = 
-#ramp-signal-2 = 
-#ramp-signal-3 = 
-#ramp-signal-4 = 
-#ramp-signal-foreground = ${colors.foreground-alt}
+ramp-signal-0 = 
+ramp-signal-1 = 
+ramp-signal-2 = 
+ramp-signal-3 = 
+ramp-signal-4 = 
+ramp-signal-foreground = ${colors.foreground-alt}
 
 [module/eth]
 type = internal/network
@@ -267,7 +266,7 @@ date = " %Y-%m-%d"
 
 time = %H:%M
 
-#format-prefix = 
+format-prefix = 
 format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #0a6cf5
 
@@ -293,11 +292,11 @@ bar-volume-foreground-5 = #f5a70a
 bar-volume-foreground-6 = #ff5555
 bar-volume-gradient = false
 bar-volume-indicator = |
-bar-volume-indicator-font = 2
+bar-volume-indicator-font = 0
 bar-volume-fill = ─
-bar-volume-fill-font = 2
+bar-volume-fill-font = 0
 bar-volume-empty = ─
-bar-volume-empty-font = 2
+bar-volume-empty-font = 0
 bar-volume-empty-foreground = ${colors.foreground-alt}
 
 [module/alsa]
@@ -368,11 +367,11 @@ type = internal/temperature
 thermal-zone = 0
 warn-temperature = 60
 
-#format = <ramp> <label>
-format = <label>
+format = <ramp> <label>
+#format = <label>
 format-underline = #f50a4d
-#format-warn = <ramp> <label-warn>
-format-warn = <label-warn>
+format-warn = <ramp> <label-warn>
+#format-warn = <label-warn>
 format-warn-underline = ${self.format-underline}
 
 label = %temperature-c%
@@ -391,9 +390,9 @@ expand-right = true
 
 format-spacing = 1
 
-label-open = P
+label-open = 
 label-open-foreground = ${colors.secondary}
-label-close = cancel
+label-close = 
 label-close-foreground = ${colors.secondary}
 label-separator = |
 label-separator-foreground = ${colors.foreground-alt}
@@ -428,6 +427,21 @@ click-left = ~/src/dotfiles/scripts/pulseaudio-tail.sh --mute
 scroll-up = ~/src/dotfiles/scripts/pulseaudio-tail.sh --up
 scroll-down = ~/src/dotfiles/scripts/pulseaudio-tail.sh --down
 tail = true
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+
+[module/mail]
+type = custom/script
+exec = ~/src/dotfiles/scripts/check_mail.sh
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+
+[module/battery-combined]
+type = custom/script
+exec = ~/src/dotfiles/scripts/battery.sh
+interval = 5.0
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
 
 [settings]
 screenchange-reload = true