diff --git a/.config/polybar/config b/.config/polybar/config
index fd9b72f..14af20a 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -210,7 +210,9 @@
 
     format-prefix = " "
     format-prefix-foreground = ${colors.foreground-alt}
-    format = <bar>
+    format-underline = #fff
+    format = <label>
+    label = %percentage%%
 
     bar-width = 10
     bar-indicator = |
@@ -251,7 +253,7 @@
 
     format-connected = <ramp-signal> <label-connected>
     format-connected-underline = #9f78e1
-    label-connected = %essid%
+    label-connected = %essid% (%signal:3%%)
 
     format-disconnected = 
 ;   format-disconnected = <label-disconnected>
@@ -286,11 +288,9 @@
     type = internal/date
     interval = 5
 
-    date =
-    date-alt = " %Y-%m-%d"
+    date = "%Y-%m-%d"
 
-    time = %H:%M
-    time-alt = %H:%M:%S
+    time = %H:%M:%S
 
     format-prefix = " "
     format-prefix-foreground = ${colors.foreground-alt}
@@ -360,17 +360,22 @@
     type = internal/battery
     battery = BAT0
     adapter = ADP1
-    full-at = 98
+;   TODO make per device configurable
+    full-at = 76
 
     format-charging = <animation-charging> <label-charging>
     format-charging-underline = #ffb52a
+    label-charging = %percentage_raw%% (%time%)
 
     format-discharging = <ramp-capacity> <label-discharging>
     format-discharging-underline = ${self.format-charging-underline}
+    label-discharging = %percentage_raw%% (%time%)
 
     format-full-prefix = " "
     format-full-prefix-foreground = ${colors.foreground-alt}
+    format-full = <label-full>
     format-full-underline = ${self.format-charging-underline}
+    label-full = %percentage_raw%%
 
     ramp-capacity-0 = 
     ramp-capacity-1 = 
@@ -398,7 +403,8 @@
 [module/temperature]
     type = internal/temperature
     thermal-zone = 0
-    warn-temperature = 60
+    base-temperature = 30
+    warn-temperature = 70
 
     format = <ramp> <label>
     format-underline = #f50a4d
@@ -409,9 +415,11 @@
     label-warn = %temperature-c%
     label-warn-foreground = ${colors.secondary}
 
-    ramp-0 = 
-    ramp-1 = 
-    ramp-2 = 
+    ramp-0 = 
+    ramp-1 = 
+    ramp-2 = 
+    ramp-3 = 
+    ramp-4 = 
     ramp-foreground = ${colors.foreground-alt}
 
 [module/powermenu]