diff --git a/.config/i3/config b/.config/i3/config
index 3817113..dcbd165 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -60,7 +60,7 @@ exec --no-startup-id remaps
 # Unclutter makes the mouse invisible after a brief period
 exec --no-startup-id unclutter
 # Run the script to update the mpd i3block on change.
-exec_always --no-startup-id i3mpdupdate
+exec_always --no-startup-id mpdupdate
 # mpd startup
 exec --no-startup-id mpd
 # Podboat automatic queue and download
diff --git a/.config/i3blocks/config b/.config/i3blocks/config
index 8758f2e..fbfb938 100644
--- a/.config/i3blocks/config
+++ b/.config/i3blocks/config
@@ -1,4 +1,4 @@
-command=/usr/lib/i3blocks/$BLOCK_NAME
+command=~/.scripts/statusbar/$BLOCK_NAME
 separator_block_width=15
 markup=pango
 
@@ -7,79 +7,63 @@ command=cat ~/.recordingicon
 interval=once
 signal=9
 
-[mpd]
+[music]
 label=🎼
-command=i3mpd
 interval=once
 signal=11
 
 [news]
 label=📰
-command=i3news
 interval=once
 signal=6
 
-[pacman]
+[pacpackages]
 label=📦
-command=i3pacman
 interval=once
 signal=8
 
-[torrents]
-command=i3torrent
+[torrent]
 interval=20
 signal=7
 
 [weather]
-command=i3weather
 interval=3600
 
-[mail]
+[mailbox]
 label=📬
-command=i3mail
 interval=180
 signal=12
 
 #[memory]
-#command=i3mem
 #interval=30
 #label=🧠
 
 #[cpu]
-#command=i3cpu
 #interval=15
 #label=💻
 
 [volume]
 interval=once
-command=i3volume
 signal=10
 
-#[diskspace]
+#[disk]
 #interval=60
-#command=i3disk /
+#command=disk /
 
-#[diskspace]
+#[disk]
 #interval=60
-#command=i3disk /home 🏠
+#command=disk /home 🏠
 
 [battery]
-command=i3battery BAT1
+command=battery BAT0
 interval=5
 
-[battery]
-command=i3battery BAT0
-interval=5
-
-[time]
+[clock]
 label=📅
-command=i3date
 interval=30
 
 [internet]
-command=i3internet
 interval=10
 
 [help]
-command=i3help
 interval=once
diff --git a/.scripts/statusbar/i3battery b/.scripts/statusbar/battery
similarity index 66%
rename from .scripts/statusbar/i3battery
rename to .scripts/statusbar/battery
index b485d9a..b2634e6 100755
--- a/.scripts/statusbar/i3battery
+++ b/.scripts/statusbar/battery
@@ -1,6 +1,9 @@
 #!/bin/sh
 # Give a battery name (e.g. BAT0) as an argument.
 
+# get xresources colors
+for x in "$(xrdb -query | sed "s/.*\./export /g;s/:\s*/=\"/g;s/$/\"/g")"; do eval "$x"; done
+
 case $BLOCK_BUTTON in
     3) pgrep -x dunst >/dev/null && notify-send "<b>🔋 Battery module:</b>
 🔋: discharging
@@ -14,21 +17,19 @@ esac
 capacity=$(cat /sys/class/power_supply/"$1"/capacity) || exit
 status=$(cat /sys/class/power_supply/"$1"/status)
 
-if [ "$capacity" -ge 80 ]; then
-	color="#b8bb26"
-elif [ "$capacity" -ge 60 ]; then
-	color="#ebdbb2"
-elif [ "$capacity" -ge 40 ]; then
-	color="#fabd2f"
-elif [ "$capacity" -ge 20 ]; then
-	color="#fe8019"
+if [ "$capacity" -ge 75 ]; then
+	color="$color10"
+elif [ "$capacity" -ge 50 ]; then
+	color="$color15"
+elif [ "$capacity" -ge 25 ]; then
+	color="$color11"
 else
-	color="#fb4934"
+	color="$color9"
 	warn="❗"
 fi
 
 [ -z $warn ] && warn=" "
 
-[ "$status" = "Charging" ] && color="#FFF"
+[ "$status" = "Charging" ] && color="$color15"
 
 printf "<span color='%s'>%s%s%s</span>" "$color" "$(echo "$status" | sed -e "s/,//g;s/Discharging/🔋/;s/Charging/🔌/;s/Unknown/♻️/;s/Full/⚡/;s/ 0*/ /g;s/ :/ /g")" "$warn" "$(echo "$capacity" | sed -e 's/$/%/')"
diff --git a/.scripts/statusbar/i3date b/.scripts/statusbar/clock
similarity index 100%
rename from .scripts/statusbar/i3date
rename to .scripts/statusbar/clock
diff --git a/.scripts/statusbar/i3cpu b/.scripts/statusbar/cpu
similarity index 87%
rename from .scripts/statusbar/i3cpu
rename to .scripts/statusbar/cpu
index 7dbdc1f..fc9d617 100755
--- a/.scripts/statusbar/i3cpu
+++ b/.scripts/statusbar/cpu
@@ -9,4 +9,4 @@ $(ps axch -o cmd:15,%cpu --sort=-%cpu | head)" ;;
 - % is of single core." ;;
 esac
 
-sensors | awk '/^temp1/ {print $2}'
+sensors | awk '/Core 0/ {print $3}'
diff --git a/.scripts/statusbar/i3disk b/.scripts/statusbar/disk
similarity index 100%
rename from .scripts/statusbar/i3disk
rename to .scripts/statusbar/disk
diff --git a/.scripts/statusbar/i3help b/.scripts/statusbar/help
similarity index 100%
rename from .scripts/statusbar/i3help
rename to .scripts/statusbar/help
diff --git a/.scripts/statusbar/i3mpdupdate b/.scripts/statusbar/i3mpdupdate
deleted file mode 100755
index 646b49e..0000000
--- a/.scripts/statusbar/i3mpdupdate
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-[ "$(pgrep -x i3mpdupdate | wc -l)" -gt 2 ] && exit
-
-while : ; do
-	pgrep -x mpd || exit
-	mpc idle > /dev/null
-	pkill -RTMIN+11 i3blocks ;
-done
diff --git a/.scripts/statusbar/i3torrent b/.scripts/statusbar/i3torrent
deleted file mode 100755
index 603ff01..0000000
--- a/.scripts/statusbar/i3torrent
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-case $BLOCK_BUTTON in
-    1) $TERMINAL -e transmission-remote-cli
-esac
-
-transmission-remote -l | grep % | sed -e "s/.*100%.*/Z/g;s/.*Idle.*/A/g;s/.*%.*/M/g" | sort -h | uniq -c | sed -e "s/Z/🌱/g;s/M/⬇️/g;s/A/⌛️/g" | awk '{print $2, $1}' | tr '\n' ' ' | sed -e "s/ $//g"
diff --git a/.scripts/statusbar/i3internet b/.scripts/statusbar/internet
similarity index 100%
rename from .scripts/statusbar/i3internet
rename to .scripts/statusbar/internet
diff --git a/.scripts/statusbar/i3mail b/.scripts/statusbar/mailbox
similarity index 100%
rename from .scripts/statusbar/i3mail
rename to .scripts/statusbar/mailbox
diff --git a/.scripts/statusbar/i3mem b/.scripts/statusbar/memory
similarity index 100%
rename from .scripts/statusbar/i3mem
rename to .scripts/statusbar/memory
diff --git a/.scripts/statusbar/i3mpd b/.scripts/statusbar/music
similarity index 100%
rename from .scripts/statusbar/i3mpd
rename to .scripts/statusbar/music
diff --git a/.scripts/statusbar/i3news b/.scripts/statusbar/news
similarity index 94%
rename from .scripts/statusbar/i3news
rename to .scripts/statusbar/news
index 9a036f5..95c9f18 100755
--- a/.scripts/statusbar/i3news
+++ b/.scripts/statusbar/news
@@ -6,7 +6,7 @@
 
 case $BLOCK_BUTTON in
         1) setsid "$TERMINAL" -e newsboat ;;
-	2) setsid newsup >/dev/null ;;
+	2) setsid newsup >/dev/null & exit ;;
         3) pgrep -x dunst >/dev/null && notify-send "<b>📰 News module:</b>
 - Shows unread news items
 - Shows 🔃 if updating with \`newsup\`
diff --git a/.scripts/statusbar/i3pacman b/.scripts/statusbar/pacpackages
similarity index 100%
rename from .scripts/statusbar/i3pacman
rename to .scripts/statusbar/pacpackages
diff --git a/.scripts/statusbar/torrent b/.scripts/statusbar/torrent
new file mode 100755
index 0000000..06ddd3e
--- /dev/null
+++ b/.scripts/statusbar/torrent
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+transmission-remote -l | grep % |
+	sed " # This first sed command is to ensure a desirable order with sort
+	s/.*Stopped.*/A/g;
+	s/.*Seeding.*/Z/g;
+	s/.*100%.*/N/g;
+	s/.*Idle.*/B/g;
+	s/.*%.*/M/g" |
+		sort -h | uniq -c | sed " # Now we replace the standin letters with icons.
+				s/A/🛑/g;
+				s/B/⌛️/g;
+				s/M/🔽/g;
+				s/N/✅/g;
+				s/Z/🌱/g" | awk '{print $2, $1}' | tr '\n' ' ' | sed -e "s/ $//g"
+
+case $BLOCK_BUTTON in
+    1) $TERMINAL -e transmission-remote-cli ;;
+    3) pgrep -x dunst >/dev/null && notify-send "<b>Torrent module:</b>
+🛑: paused
+⏳: waiting
+🔽: downloading
+✅: done
+🌱: done and seeding" ;;
+esac
+
diff --git a/.scripts/statusbar/i3volume b/.scripts/statusbar/volume
similarity index 100%
rename from .scripts/statusbar/i3volume
rename to .scripts/statusbar/volume
diff --git a/.scripts/statusbar/i3weather b/.scripts/statusbar/weather
similarity index 100%
rename from .scripts/statusbar/i3weather
rename to .scripts/statusbar/weather