diff --git a/bspwm/.config/scripts/bar2.sh b/bspwm/.config/scripts/bar2.sh
index 03a74c6..4657b17 100755
--- a/bspwm/.config/scripts/bar2.sh
+++ b/bspwm/.config/scripts/bar2.sh
@@ -13,6 +13,8 @@ BATTERY_LOW="^fg(#C37561)"
 FONT="Liberation Mono-8"
 COLOR_SERVICE_RUNNING="^fg(#EEEEEE)"
 COLOR_SERVICE_STOPPED="^fg(#666666)"
+BATTERY_CHARGING="^fg(#66a84a)"
+BATTERY_DISCHARGING="^fg(#C37561)"
 
 ASSET=~/.config/assets
 WS_UNFOCUS="^i($ASSET/wsfree.xbm)"
@@ -29,7 +31,7 @@ mybar () {
 
 clock() {
     while true; do
-        echo "${LABEL}Time:${FG} $(date '+%a %d %b') | $(date '+%H:%M:%S')"
+        echo "${LABEL}T:${FG} $(date '+%a %d %b') | $(date '+%H:%M:%S')"
         sleep 1;
     done
 }
@@ -44,12 +46,12 @@ battery() {
         fi
 
         if [ -n "$(acpi -a | grep on-line)" ]; then
-            batcha="Charging"
+            batcha="${BATTERY_CHARGING}+${FG}"
         else
-            batcha="Discharging"
+            batcha="${BATTERY_DISCHARGING}-${FG}"
         fi
 
-        echo "${LABEL}Battery:${FG} $batlev, $batcha"
+        echo "${LABEL}B:${FG} $batlev $batcha"
 
         sleep 30
     done
@@ -61,7 +63,7 @@ wifi() {
         if [ -z "$info" ]; then
             info="-"
         fi
-        echo "${LABEL}Wifi:${FG} $info"
+        echo "${LABEL}W:${FG} $info"
         sleep 2;
     done
 }
@@ -110,7 +112,7 @@ updates() {
 
         updates="$pac+$aur-$useless"
 
-        echo "${LABEL}Updates:${FG} ${updates}"
+        echo "${LABEL}U:${FG} ${updates}"
 
         sleep 1m;
     done
@@ -124,7 +126,7 @@ music() {
                 if [ -n "$(mpc status | grep -e paused)" ]; then
                     info="${info}, Paused"
                 fi
-                echo "${LABEL}Music:${FG} ${info}"
+                echo "${LABEL}M:${FG} ${info}"
 
                 mpc idle 2>&1 1>/dev/null
             done | mybar 400 T 0
@@ -152,16 +154,16 @@ services() {
     done
 }
 
-workspace | mybar 200 T 50 &
+workspace | mybar 180 T 50 &
 
-clock | mybar 250 B 100 &
+clock | mybar 230 B 100 &
 
-battery | mybar 200 B 25 &
+battery | mybar 100 B 29 &
 
-wifi | mybar 140 B 0 &
+wifi | mybar 200 B 0 &
 
 music &
 
-updates | mybar 130 B 75 &
+updates | mybar 100 B 71 &
 
 services | mybar 50 B 50