diff --git a/polybar/config.ini b/polybar/config.ini
index f0f15f6..c26955d 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -103,7 +103,7 @@ interval = 24
 
 mount-0 = /
 
-label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
+label-mounted = %{F#0a81f5}%mountpoint%%{F}: %percentage_used%%
 label-unmounted = %mountpoint% not mounted
 label-unmounted-foreground = ${colors.foreground-alt}
 
@@ -229,7 +229,7 @@ card = intel_backlight
 type = internal/cpu
 interval = 3
 ;format-prefix = " "
-format = "%{A1:i3-sensible-terminal -e htop &:}<ramp-coreload>%{A}%{O-20}"
+format = "%{A1:i3-sensible-terminal -e htop &:}<ramp-coreload>%{A}%{O-22}"
 format-foreground = ${colors.foreground-alt}
 format-prefix-foreground = ${colors.foreground-alt}
 
@@ -240,17 +240,17 @@ format-prefix-foreground = ${colors.foreground-alt}
 label = %percentage%
 
 ramp-coreload-0 = ▁
-ramp-coreload-0-foreground = ${colors.foreground-alt}
+ramp-coreload-0-foreground = #444
 ramp-coreload-1 = ▂
-ramp-coreload-1-foreground = ${colors.foreground-alt}
+ramp-coreload-1-foreground = #444
 ramp-coreload-2 = ▃
-ramp-coreload-2-foreground = ${colors.foreground-alt}
+ramp-coreload-2-foreground = #444
 ramp-coreload-3 = ▄
-ramp-coreload-3-foreground = ${colors.foreground-alt}
+ramp-coreload-3-foreground = #444
 ramp-coreload-4 = ▅
-ramp-coreload-4-foreground = ${colors.foreground-alt}
+ramp-coreload-4-foreground = #666
 ramp-coreload-5 = ▆
-ramp-coreload-5-foreground = ${colors.foreground-alt}
+ramp-coreload-5-foreground = #888
 ramp-coreload-6 = ▇
 ramp-coreload-6-foreground = ${colors.foreground-caution}
 ramp-coreload-7 = █
@@ -260,7 +260,8 @@ ramp-coreload-7-foreground = ${colors.foreground-alert}
 type = internal/memory
 interval = 3
 format = "<label>"
-label = "%{A1:i3-sensible-terminal -e htop &:}%{F#777}%{F}%percentage_used:3%%{A}%{O-20}"
+format-foreground = ${colors.foreground-alt}
+label = "%{A1:i3-sensible-terminal -e htop &:}%percentage_used:3%%{A}%{O-20}"
 
 [module/temperature]
 type = internal/temperature
@@ -268,9 +269,11 @@ thermal-zone = 0
 warn-temperature = 80
 
 interval = 3
+units = false
 
 ;format = <ramp> <label>
-format = "%{A1:i3-sensible-terminal -e watch sensors &:}%{F#888}%{F}  <label>%{A}"
+format = "%{A1:i3-sensible-terminal -e watch sensors &:}<label>%{A}"
+format-foreground = ${colors.foreground-alt}
 format-warn = %{T3}%{T-} <label-warn>
 format-warn-foreground = ${colors.foreground-alert}
 
@@ -357,25 +360,24 @@ ramp-volume-2 = 
 type = internal/battery
 battery = BAT0
 adapter = AC
-full-at = 95
+full-at = 90
 interval = 5
 
-format-charging = %{T7}%{F555}%{O-18}%{FED9}<ramp-capacity>%{O-17}%{F000}%{F}%{T-}%{O2}<label-charging>
+format-charging = %{T7}%{F#555}%{O-18}%{F#DDA}<ramp-capacity>%{O-17}%{F000}%{F}%{T-}%{O2}<label-charging>
 label-charging  = %percentage%
 
-format-discharging = %{F555}%{O-18}%{F}<ramp-capacity>%{O2}<label-discharging>
+format-discharging = %{F#555}%{O-18}%{F}<ramp-capacity>%{O2}<label-discharging>
 label-discharging  = %percentage%
 
-format-full = ""
-format-full-foreground = ${colors.foreground-alert}
+format-full = "%{F#dda}%{F#eea} unplug%{F}"
 
 ; <5
-ramp-capacity-0  = %{F#F55}
+ramp-capacity-0  = %{F#f55}
 ; 5
-ramp-capacity-1  = %{F#F55}
+ramp-capacity-1  = %{F#f55}
 ; 10
-ramp-capacity-2  = %{F#F55}
-ramp-capacity-3  = %{F#F55}
+ramp-capacity-2  = %{F#f55}
+ramp-capacity-3  = %{F#f55}
 ; 20
 ramp-capacity-4  = 
 ramp-capacity-5  = 