diff --git a/bin/battery-m1 b/bin/battery-m1
deleted file mode 100755
index d793ddb..0000000
--- a/bin/battery-m1
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-MAX="$(sysctl -n hw.sensors.aplsmc0.amphour1 | cut -d ' ' -f 1)"
-POWER="$(sysctl -n hw.sensors.aplsmc0.amphour0 | cut -d ' ' -f 1)"
-PERCENT=$({ echo scale=1; echo "$POWER*100/$MAX"; } | bc)
-echo ${PERCENT}%
diff --git a/bin/battery-t410 b/bin/battery-t410
deleted file mode 100755
index 41e3770..0000000
--- a/bin/battery-t410
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-MAX="$(sysctl -n hw.sensors.acpibat0.amphour0 | cut -d ' ' -f 1)"
-POWER="$(sysctl -n hw.sensors.acpibat0.amphour3 | cut -d ' ' -f 1)"
-PERCENT=$({ echo scale=1; echo "$POWER*100/$MAX"; } | bc)
-echo ${PERCENT}%
diff --git a/bin/battery-t430 b/bin/battery-t430
deleted file mode 100755
index 7f3132e..0000000
--- a/bin/battery-t430
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-MAX="$(sysctl -n hw.sensors.acpibat0.watthour0 | cut -d ' ' -f 1)"
-POWER="$(sysctl -n hw.sensors.acpibat0.watthour3 | cut -d ' ' -f 1)"
-PERCENT=$({ echo scale=1; echo "$POWER*100/$MAX"; } | bc)
-echo ${PERCENT}%
diff --git a/bin/battery-t495 b/bin/battery-t495
deleted file mode 100755
index 7f3132e..0000000
--- a/bin/battery-t495
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-MAX="$(sysctl -n hw.sensors.acpibat0.watthour0 | cut -d ' ' -f 1)"
-POWER="$(sysctl -n hw.sensors.acpibat0.watthour3 | cut -d ' ' -f 1)"
-PERCENT=$({ echo scale=1; echo "$POWER*100/$MAX"; } | bc)
-echo ${PERCENT}%
diff --git a/bin/battery-t60 b/bin/battery-t60
deleted file mode 100755
index 7f3132e..0000000
--- a/bin/battery-t60
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-MAX="$(sysctl -n hw.sensors.acpibat0.watthour0 | cut -d ' ' -f 1)"
-POWER="$(sysctl -n hw.sensors.acpibat0.watthour3 | cut -d ' ' -f 1)"
-PERCENT=$({ echo scale=1; echo "$POWER*100/$MAX"; } | bc)
-echo ${PERCENT}%
diff --git a/bin/battery-x1 b/bin/battery-x1
deleted file mode 100755
index 7f3132e..0000000
--- a/bin/battery-x1
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-MAX="$(sysctl -n hw.sensors.acpibat0.watthour0 | cut -d ' ' -f 1)"
-POWER="$(sysctl -n hw.sensors.acpibat0.watthour3 | cut -d ' ' -f 1)"
-PERCENT=$({ echo scale=1; echo "$POWER*100/$MAX"; } | bc)
-echo ${PERCENT}%
diff --git a/bin/battery-x240 b/bin/battery-x240
deleted file mode 100755
index 9f94af3..0000000
--- a/bin/battery-x240
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-MAX="$(sysctl -n hw.sensors.acpibat1.watthour0 | cut -d ' ' -f 1)"
-POWER="$(sysctl -n hw.sensors.acpibat1.watthour3 | cut -d ' ' -f 1)"
-PERCENT=$({ echo scale=1; echo "$POWER*100/$MAX"; } | bc)
-echo ${PERCENT}%
diff --git a/bin/check-signify.sh b/bin/check-signify.sh
deleted file mode 100644
index a0bd1cd..0000000
--- a/bin/check-signify.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-for D in [3-9].*/ [3-9].*/*/; do
- (
- cd $D
- echo -n '# '
- pwd
- signify -C -x SHA256.sig | grep -v OK
- )
-done
diff --git a/bin/egress_interface b/bin/egress_interface
deleted file mode 100755
index 2bd9148..0000000
--- a/bin/egress_interface
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ifconfig egress | head -n 1 | cut -d : -f 1
diff --git a/bin/host-ip b/bin/host-ip
deleted file mode 100755
index 2b7b3b8..0000000
--- a/bin/host-ip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ifconfig egress | grep 'inet ' | head -n 1 | cut -d ' ' -f 2
diff --git a/bin/load b/bin/load
deleted file mode 100755
index 87bbe1f..0000000
--- a/bin/load
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-uptime | egrep -o 'load averages: .*' | cut -d : -f 2 | cut -c 2-
diff --git a/bin/nwid b/bin/nwid
deleted file mode 100755
index f788641..0000000
--- a/bin/nwid
+++ /dev/null
@@ -1 +0,0 @@
-ifconfig iwm0 | egrep -o 'nwid [^ ]*' | cut -d\ -f 2
diff --git a/bin/nwid-m1 b/bin/nwid-m1
deleted file mode 100755
index 59787e3..0000000
--- a/bin/nwid-m1
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ifconfig bwfm0 | egrep -o 'join [^ ]*' | cut -d\ -f 2
diff --git a/bin/plugged b/bin/plugged
deleted file mode 100755
index ea6c166..0000000
--- a/bin/plugged
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if sysctl -n hw.sensors.acpiac0.indicator0 | grep On >/dev/null; then
- echo "+"
-else
- false
-fi
diff --git a/bin/plugged-m1 b/bin/plugged-m1
deleted file mode 100755
index 8942c2e..0000000
--- a/bin/plugged-m1
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if sysctl -n hw.sensors.aplsmc0.indicator0 | grep On >/dev/null; then
- echo "+"
-else
- false
-fi
diff --git a/bin/status-m1 b/bin/status-m1
deleted file mode 100755
index 844e319..0000000
--- a/bin/status-m1
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid-m1) $(~/bin/load) $(~/bin/temperature-m1) $(~/bin/battery-m1)$(~/bin/plugged-m1) $(date)"
diff --git a/bin/status-m700 b/bin/status-m700
deleted file mode 100755
index ae2acb0..0000000
--- a/bin/status-m700
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-m700) $(date)"
diff --git a/bin/status-r7 b/bin/status-r7
deleted file mode 100755
index 0202088..0000000
--- a/bin/status-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name " dwm $(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-r7) $(date)"
diff --git a/bin/status-r8 b/bin/status-r8
deleted file mode 100755
index f27b566..0000000
--- a/bin/status-r8
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name " dwm $(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-t495) $(~/bin/battery-t495)$(~/bin/plugged) $(date)"
diff --git a/bin/status-t410 b/bin/status-t410
deleted file mode 100755
index bc44853..0000000
--- a/bin/status-t410
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-t410) $(~/bin/battery-t410)$(~/bin/plugged) $(date)"
diff --git a/bin/status-t430 b/bin/status-t430
deleted file mode 100755
index cc6584a..0000000
--- a/bin/status-t430
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-t430) $(~/bin/battery-t430)$(~/bin/plugged) $(date)"
diff --git a/bin/status-t495 b/bin/status-t495
deleted file mode 100755
index a4d34e3..0000000
--- a/bin/status-t495
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-t495) $(~/bin/battery-t495)$(~/bin/plugged) $(date)"
diff --git a/bin/status-t60 b/bin/status-t60
deleted file mode 100755
index 0a1da71..0000000
--- a/bin/status-t60
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name "dwm $(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-t60) $(~/bin/battery-t60)$(~/bin/plugged) $(date)"
diff --git a/bin/status-x1 b/bin/status-x1
deleted file mode 100755
index 417afb2..0000000
--- a/bin/status-x1
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-x1) $(~/bin/battery-x1)$(~/bin/plugged) $(date)"
diff --git a/bin/status-x240 b/bin/status-x240
deleted file mode 100755
index ede4bd3..0000000
--- a/bin/status-x240
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-x240) $(~/bin/battery-x240)$(~/bin/plugged) $(date)"
diff --git a/bin/temperature-m1 b/bin/temperature-m1
deleted file mode 100755
index abe29fd..0000000
--- a/bin/temperature-m1
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-temp() {
- echo $(sysctl -n $1 | cut -d\ -f 1)°C
-}
-rpm() {
- echo $(sysctl -n $1 | cut -d\ -f 1)RPM
-}
-echo "$(temp hw.sensors.aplsmc0.temp0) $(temp hw.sensors.aplsmc0.temp1) $(temp hw.sensors.aplsmc0.temp2) $(temp hw.sensors.aplsmc0.temp3) $(rpm hw.sensors.aplsmc0.fan0)"
diff --git a/bin/temperature-m700 b/bin/temperature-m700
deleted file mode 100755
index 1d54aa3..0000000
--- a/bin/temperature-m700
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-CPUTEMP=$(sysctl -n hw.sensors.cpu0.temp0 | cut -d\ -f 1)
-MBTEMP0=$(sysctl -n hw.sensors.acpitz0.temp0 | cut -d\ -f 1)
-MBTEMP1=$(sysctl -n hw.sensors.acpitz1.temp0 | cut -d\ -f 1)
-echo "${CPUTEMP}°C ${MBTEMP0}°C ${MBTEMP1}°C"
diff --git a/bin/temperature-r7 b/bin/temperature-r7
deleted file mode 100755
index a805a9a..0000000
--- a/bin/temperature-r7
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-CPUTEMP=$(sysctl -n hw.sensors.cpu0.temp0 | cut -d\ -f 1)
-MBTEMP=$(sysctl -n hw.sensors.acpitz0.temp0 | cut -d\ -f 1)
-echo "${CPUTEMP}°C ${MBTEMP}°C"
diff --git a/bin/temperature-t410 b/bin/temperature-t410
deleted file mode 100755
index 5c4a7de..0000000
--- a/bin/temperature-t410
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-CPUTEMP=$(sysctl -n hw.sensors.cpu0.temp0 | cut -d\ -f 1)
-MBTEMP=$(sysctl -n hw.sensors.aps0.temp0 | cut -d\ -f 1)
-echo "${CPUTEMP}°C ${MBTEMP}°C"
diff --git a/bin/temperature-t430 b/bin/temperature-t430
deleted file mode 100755
index 1ce9f40..0000000
--- a/bin/temperature-t430
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-CPUTEMP=$(sysctl -n hw.sensors.cpu0.temp0 | cut -d\ -f 1)
-MBTEMP=$(sysctl -n hw.sensors.acpithinkpad0.temp0 | cut -d\ -f 1)
-echo "${CPUTEMP}°C ${MBTEMP}°C"
diff --git a/bin/temperature-t495 b/bin/temperature-t495
deleted file mode 100755
index b03e81c..0000000
--- a/bin/temperature-t495
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-temp() {
- sysctl -n hw.sensors.$1 | cut -d\ -f 1
-}
-echo "$(temp acpithinkpad0.temp0)°C $(temp acpithinkpad0.temp1)°C $(temp acpithinkpad0.temp2)°C $(temp ksmn0.temp0)°C"
diff --git a/bin/temperature-t60 b/bin/temperature-t60
deleted file mode 100755
index 5c4a7de..0000000
--- a/bin/temperature-t60
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-CPUTEMP=$(sysctl -n hw.sensors.cpu0.temp0 | cut -d\ -f 1)
-MBTEMP=$(sysctl -n hw.sensors.aps0.temp0 | cut -d\ -f 1)
-echo "${CPUTEMP}°C ${MBTEMP}°C"
diff --git a/bin/temperature-x1 b/bin/temperature-x1
deleted file mode 100755
index a805a9a..0000000
--- a/bin/temperature-x1
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-CPUTEMP=$(sysctl -n hw.sensors.cpu0.temp0 | cut -d\ -f 1)
-MBTEMP=$(sysctl -n hw.sensors.acpitz0.temp0 | cut -d\ -f 1)
-echo "${CPUTEMP}°C ${MBTEMP}°C"
diff --git a/bin/temperature-x240 b/bin/temperature-x240
deleted file mode 100755
index 1ce9f40..0000000
--- a/bin/temperature-x240
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-CPUTEMP=$(sysctl -n hw.sensors.cpu0.temp0 | cut -d\ -f 1)
-MBTEMP=$(sysctl -n hw.sensors.acpithinkpad0.temp0 | cut -d\ -f 1)
-echo "${CPUTEMP}°C ${MBTEMP}°C"
diff --git a/bin/xsetroot-name/status-m1 b/bin/xsetroot-name/status-m1
new file mode 100755
index 0000000..844e319
--- /dev/null
+++ b/bin/xsetroot-name/status-m1
@@ -0,0 +1,2 @@
+#!/bin/sh
+xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid-m1) $(~/bin/load) $(~/bin/temperature-m1) $(~/bin/battery-m1)$(~/bin/plugged-m1) $(date)"
diff --git a/bin/xsetroot-name/status-m700 b/bin/xsetroot-name/status-m700
new file mode 100755
index 0000000..ae2acb0
--- /dev/null
+++ b/bin/xsetroot-name/status-m700
@@ -0,0 +1,2 @@
+#!/bin/sh
+xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-m700) $(date)"
diff --git a/bin/xsetroot-name/status-r7 b/bin/xsetroot-name/status-r7
new file mode 100755
index 0000000..0202088
--- /dev/null
+++ b/bin/xsetroot-name/status-r7
@@ -0,0 +1,2 @@
+#!/bin/sh
+xsetroot -name " dwm $(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-r7) $(date)"
diff --git a/bin/xsetroot-name/status-t410 b/bin/xsetroot-name/status-t410
new file mode 100755
index 0000000..bc44853
--- /dev/null
+++ b/bin/xsetroot-name/status-t410
@@ -0,0 +1,2 @@
+#!/bin/sh
+xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-t410) $(~/bin/battery-t410)$(~/bin/plugged) $(date)"
diff --git a/bin/xsetroot-name/status-t430 b/bin/xsetroot-name/status-t430
new file mode 100755
index 0000000..cc6584a
--- /dev/null
+++ b/bin/xsetroot-name/status-t430
@@ -0,0 +1,2 @@
+#!/bin/sh
+xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-t430) $(~/bin/battery-t430)$(~/bin/plugged) $(date)"
diff --git a/bin/xsetroot-name/status-t60 b/bin/xsetroot-name/status-t60
new file mode 100755
index 0000000..0a1da71
--- /dev/null
+++ b/bin/xsetroot-name/status-t60
@@ -0,0 +1,2 @@
+#!/bin/sh
+xsetroot -name "dwm $(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-t60) $(~/bin/battery-t60)$(~/bin/plugged) $(date)"
diff --git a/bin/xsetroot-name/status-x1 b/bin/xsetroot-name/status-x1
new file mode 100755
index 0000000..417afb2
--- /dev/null
+++ b/bin/xsetroot-name/status-x1
@@ -0,0 +1,2 @@
+#!/bin/sh
+xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-x1) $(~/bin/battery-x1)$(~/bin/plugged) $(date)"
diff --git a/bin/xsetroot-name/status-x240 b/bin/xsetroot-name/status-x240
new file mode 100755
index 0000000..ede4bd3
--- /dev/null
+++ b/bin/xsetroot-name/status-x240
@@ -0,0 +1,2 @@
+#!/bin/sh
+xsetroot -name "$(hostname) $(~/bin/egress_interface) $(~/bin/host-ip) $(~/bin/nwid) $(~/bin/load) $(~/bin/temperature-x240) $(~/bin/battery-x240)$(~/bin/plugged) $(date)"