diff --git a/.fehbg/wallpaper.png b/.fehbg/wallpaper.png
new file mode 100644
index 0000000..01cbe9a
Binary files /dev/null and b/.fehbg/wallpaper.png differ
diff --git a/.xinitrc b/.xinitrc
index bc20821..aca8c5b 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,12 +1,54 @@
+#!/bin/sh
+
 # Set keyboard layout
-setxkbmap -option 'grp:alt_shift_toggle' -option 'caps:swapescape' 'dvorak,ru'
+setxkbmap \
+    -option 'grp:alt_shift_toggle' \
+    -option 'caps:swapescape' \
+    'dvorak,ru'
+
+# Battery
+BATTERY="BAT0"
+HAS_BATTERY="no"
+LOW_BATTERY_LIMIT=20
+if [ -d /sys/class/power_supply/$BATTERY ]; then
+    HAS_BATTERY="yes"
+fi
+
+battery_is_charging() {
+    battery_status=$(cat /sys/class/power_supply/$BATTERY/status)
+
+    if [ $battery_status = "Charging" ]; then
+        return 0;
+    fi
+
+    return 1;
+}
+
+battery_level() {
+    echo $(cat /sys/class/power_supply/$BATTERY/capacity)
+}
+
+battery_level_too_low() {
+    if [ $(eval battery_level) -lt $LOW_BATTERY_LIMIT ]; then
+        return 0;
+    fi
+
+    return 1;
+}
 
 while true; do
     XROOTNAME="RAM: $(free -m | grep '^Mem' | awk '{print $3"MB"}') |"
-    XROOTNAME="$XROOTNAME CPU: $(mpstat | awk '$13 ~ /[0-9.]+/ { print 100 - $13"%" }') |"
+    XROOTNAME="$XROOTNAME CPU: $(top -bn1 | awk '/Cpu/ { print $2}')% |"
+    if [ $HAS_BATTERY = "yes" ]; then
+        XROOTNAME="$XROOTNAME BAT: $(eval battery_level)%"
+        if battery_level_too_low; then
+            XROOTNAME="$XROOTNAME PLUG CHARGER"
+        fi
+        XROOTNAME="$XROOTNAME |"
+    fi
     XROOTNAME="$XROOTNAME $(date +"%F %R")"
-    xsetroot -name "$XROOTNAME"
 
+    xsetroot -name "$XROOTNAME"
     sleep 20s
 done &
 
@@ -15,5 +57,4 @@ xsetroot -solid gray
 feh --bg-scale ./.fehbg/wallpaper.png
 
 # Start window manager
-picom &
 exec dwm
diff --git a/Makefile b/Makefile
index bdf5dfb..6c54e0d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,4 @@
 install:
 	stow .
 
-themes:
-	mkdir -p .$@
-	wget -P .$@ https://github.com/EliverLara/Nordic/releases/download/v2.2.0/Nordic.tar.xz
-	wget -P .$@ https://github.com/EliverLara/Nordic/releases/download/v2.2.0/Nordic-Polar.tar.xz
-	tar xJf .$@/Nordic.tar.xz -C .$@/
-	tar xJf .$@/Nordic-Polar.tar.xz -C .$@/
-	rm .$@/*.tar.xz
-
-.PHONY: install themes
+.PHONY: install