diff --git a/.gitmodules b/.gitmodules
index cfcbd12..c11093e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "tmuxcompose"]
 	path = tmuxcompose
 	url = https://github.com/truck/tmuxcompose
-[submodule "fonts/codeface"]
-	path = fonts/codeface
-	url = https://github.com/chrissimpkins/codeface
diff --git a/aliases b/aliases
index 0e4b4b0..73426c5 100644
--- a/aliases
+++ b/aliases
@@ -1 +1,15 @@
 ruler() { for s in '....^....|' '1234567890'; do w=${#s}; str=$( for (( i=1; $i<=$((($COLUMNS + $w) / $w )) ; i=$i+1 )); do echo -n $s; done ); str=$(echo $str | cut -c -$COLUMNS) ; echo $str; done; }
+
+mktruckdir() {
+    USER=$(whoami)
+    sudo mkdir ${1}
+    sudo chown ${USER}:${USER} ${1}
+}
+
+randmac() {
+       dd status=none if=/dev/urandom bs=1k count=42|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
+}
+
+randmacxen() {
+       dd status=none if=/dev/urandom bs=1k count=42|md5sum|sed 's/^\(..\)\(..\)\(..\).*$/00:16:3E:\1:\2:\3'/
+}
diff --git a/amigaterm.sh b/amigaterm.sh
deleted file mode 100755
index 756a2e7..0000000
--- a/amigaterm.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/zsh
-~/bin/amigaterm2.sh 10 navy 80 orange green $@
diff --git a/amigaterm2.sh b/amigaterm2.sh
deleted file mode 100755
index a3f11c0..0000000
--- a/amigaterm2.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/zsh
-# help shit
-if [[ $1 == '-h' ]]; then
-    echo Help: $0 fontsize tintcolor fadepercent fadecolor cursorcolor extrashit
-else
-#TP="TopazPlus a600a1200a4000 for Powerline-$1"
-    TP="xft:TopazPlus a500a1000a2000 for Powerline-${1}:antialias=false,xft:Symbola-${1}:antialias=false"
-    PN="xft:P0T\-NOoDLE for Powerline-${1}"
-    MS="xft:mOsOul for Powerline-${1}"
-    MK="xft:MicroKnightPlus for Powerline-${1}"
-    TINTCOLOR=$2
-    FADEPERCENT=$3
-    FADECOLOR=$4
-    CURSORCOLOR=$5
-# get rid of these arguments so we can do the rest at the end
-    shift 5
-echo    urxvtc -fn \"${TP}\" -fi "${PN}" -fb \"${MS}\" -fbi \"${MK}\" \
-	-tint \"${TINTCOLOR}\" -fade \"${FADEPERCENT}\" \
-        -fadecolor \"${FADECOLOR}\" -cr \"${CURSORCOLOR}\" \
-	-rv -tr -sb -sr -g 80x24 +is -tn \"xterm-256color\" $@
-
-    urxvtc -fn "${TP}" -fi "${PN}" -fb "${MS}" -fbi "${MK}" \
-	-tint "${TINTCOLOR}" -fade "${FADEPERCENT}" \
-        -fadecolor "${FADECOLOR}" -cr "${CURSORCOLOR}" \
-	-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
-
-    if [[ $? != 0 ]]; then
-	    urxvtd -f -o
-	    urxvtc -fn "${TP}" -fi "${PN}" -fb "${MS}" -fbi "${MK}" \
-		-tint "${TINTCOLOR}" -fade "${FADEPERCENT}" \
-		-fadecolor "${FADECOLOR}" -cr "${CURSORCOLOR}" \
-		-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
-    fi
-fi
diff --git a/amigaterm3.sh b/amigaterm3.sh
deleted file mode 100644
index a78c8b6..0000000
--- a/amigaterm3.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/zsh
-# help shit
-if [[ $1 == '-h' ]]; then
-    echo Help: $0 fontsize tintcolor fadepercent fadecolor cursorcolor extrashit
-else
-#TP="xft:TopazPlus a600a1200a4000-$1"
-    TP="xft:TopazPlus a600a1200a4000-$1:antialias=false"
-    PN="xft:P0T\-NOoDLE-$1"
-    MS="xft:mOsOul-$1"
-    MK="xft:Microknight-$1"
-    TINTCOLOR=$2
-    FADEPERCENT=$3
-    FADECOLOR=$4
-    CURSORCOLOR=$5
-# get rid of these arguments so we can do the rest at the end
-    shift 5
-echo    urxvtc -fn "$TP" -fi "$PN" -fb "$MS" -fbi "$MK" \
-	-tint "$TINTCOLOR" -fade "$FADEPERCENT" \
-        -fadecolor "$FADECOLOR" -cr "$CURSORCOLOR" \
-	-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
-
-    urxvtc -fn "$TP" -fi "$PN" -fb "$MS" -fbi "$MK" \
-	-tint "$TINTCOLOR" -fade "$FADEPERCENT" \
-        -fadecolor "$FADECOLOR" -cr "$CURSORCOLOR" \
-	-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
-
-    if [[ $? != 0 ]]; then
-	    urxvtd -f -o
-	    urxvtc -fn "$TP" -fi "$PN" -fb "$MS" -fbi "$MK" \
-		-tint "$TINTCOLOR" -fade "$FADEPERCENT" \
-		-fadecolor "$FADECOLOR" -cr "$CURSORCOLOR" \
-		-rv -tr -sb -sr -g 80x24 +is -tn "xterm-256color" $@
-    fi
-fi
diff --git a/badssh b/badssh
deleted file mode 100755
index 057436d..0000000
--- a/badssh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/zsh
-ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${@}"
-
diff --git a/blgterm.sh b/blgterm.sh
deleted file mode 100755
index 9345189..0000000
--- a/blgterm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-urxvtc -fn "xft:TopazPlus a600a1200a4000-:antialias=false" \
--fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
-+is -fg black \
--bg lightgrey \
--cr orange
diff --git a/bullettrain b/bullettrain
deleted file mode 100644
index 90e7c64..0000000
--- a/bullettrain
+++ /dev/null
@@ -1,16 +0,0 @@
-BULLETTRAIN_VIRTUALENV_PREFIX=µ
-BULLETTRAIN_VIRTUALENV_BG=45
-BULLETTRAIN_VIRTUALENV_FG=17
-
-BULLETTRAIN_GIT_FG=31
-BULLETTRAIN_GIT_BG=14
-
-BULLETTRAIN_TIME_FG=147
-BULLETTRAIN_TIME_BG=27
-
-BULLETTRAIN_DIR_FG=237
-BULLETTRAIN_DIR_BG=39
-
-BULLETTRAIN_PROMPT_CHAR="»"
-BULLETTRAIN_PROMPT_ROOT=true
-
diff --git a/byterm.sh b/byterm.sh
deleted file mode 100755
index ced5aa0..0000000
--- a/byterm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-urxvtc -fn "xft:TopazPlus a600a1200a4000-:antialias=false" \
--fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
-+is -fg yellow \
--bg navy \
--cr firebrick
diff --git a/cowerup b/cowerup
deleted file mode 100755
index 12963c2..0000000
--- a/cowerup
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/zsh
-
-cd ~/cower
-rm -rf $1
-cower -d $1
-cd $1
-$EDITOR PKGBUILD
-makepkg -isc
diff --git a/db_background.sh b/db_background.sh
deleted file mode 100755
index e23af2c..0000000
--- a/db_background.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/zsh
-while true; do
-#  feh --bg-scale -z --no-xinerama ~/DB-triple-7680x1600
-  feh --bg-fill -z --no-xinerama ~/DB-triple-7680x1600
-  sleep 1h
-done
diff --git a/dotmg b/dotmg
new file mode 100644
index 0000000..15fb129
--- /dev/null
+++ b/dotmg
@@ -0,0 +1,3 @@
+global-set-key "\^?" delete-backward-char
+global-set-key "\^h\^h" bsmap-mode
+global-set-key "\^hh" help-help
diff --git a/fixdns.sh b/fixdns.sh
deleted file mode 100755
index 9ba2ad3..0000000
--- a/fixdns.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/zsh
-cd /tmp/
-curl -o resolv.conf -L "https://api.opennicproject.org/geoip/?resolv&ipv=4"
-sudo mv resolv.conf /etc/
-
diff --git a/fonts/MicroKnightPlusPowerline.ttf b/fonts/MicroKnightPlusPowerline.ttf
deleted file mode 100644
index 9ad6dc0..0000000
Binary files a/fonts/MicroKnightPlusPowerline.ttf and /dev/null differ
diff --git a/fonts/MicroKnightPlus_v1.0.ttf b/fonts/MicroKnightPlus_v1.0.ttf
deleted file mode 100644
index 8be9477..0000000
Binary files a/fonts/MicroKnightPlus_v1.0.ttf and /dev/null differ
diff --git a/fonts/MicroKnight_v1.0.ttf b/fonts/MicroKnight_v1.0.ttf
deleted file mode 100644
index f6c0b25..0000000
Binary files a/fonts/MicroKnight_v1.0.ttf and /dev/null differ
diff --git a/fonts/P0T-NOoDLE-Powerline.ttf b/fonts/P0T-NOoDLE-Powerline.ttf
deleted file mode 100644
index a6bab41..0000000
Binary files a/fonts/P0T-NOoDLE-Powerline.ttf and /dev/null differ
diff --git a/fonts/P0T-NOoDLE_v1.0.ttf b/fonts/P0T-NOoDLE_v1.0.ttf
deleted file mode 100644
index 360b072..0000000
Binary files a/fonts/P0T-NOoDLE_v1.0.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_AMI_BIOS-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_AMI_BIOS-2y.ttf
deleted file mode 100644
index c8d2ea7..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_AMI_BIOS-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_AMI_BIOS.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_AMI_BIOS.ttf
deleted file mode 100644
index f2f0604..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_AMI_BIOS.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x14.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x14.ttf
deleted file mode 100644
index e2a87ea..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x14.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x16.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x16.ttf
deleted file mode 100644
index a9c5ee3..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x16.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x8-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x8-2y.ttf
deleted file mode 100644
index 7e771cf..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x8-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x8.ttf
deleted file mode 100644
index 507a6b6..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_8x8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_9x14.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_9x14.ttf
deleted file mode 100644
index 85c22d5..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_9x14.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_9x16.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_9x16.ttf
deleted file mode 100644
index 37334bf..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_9x16.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_SmallW_6x8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_SmallW_6x8.ttf
deleted file mode 100644
index 0368a74..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATI_SmallW_6x8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATT_PC6300-2x.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATT_PC6300-2x.ttf
deleted file mode 100644
index 377e36f..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATT_PC6300-2x.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ATT_PC6300.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ATT_PC6300.ttf
deleted file mode 100644
index 497063b..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ATT_PC6300.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_AmstradPC1512-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_AmstradPC1512-2y.ttf
deleted file mode 100644
index d582a5c..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_AmstradPC1512-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_AmstradPC1512.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_AmstradPC1512.ttf
deleted file mode 100644
index e6d0cc3..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_AmstradPC1512.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x14.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x14.ttf
deleted file mode 100644
index 62c27da..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x14.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x16.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x16.ttf
deleted file mode 100644
index d5ebb68..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x16.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x8.ttf
deleted file mode 100644
index 5a1957d..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_CompaqThin_8x8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_DTK_BIOS-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_DTK_BIOS-2y.ttf
deleted file mode 100644
index f99ac14..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_DTK_BIOS-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_DTK_BIOS.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_DTK_BIOS.ttf
deleted file mode 100644
index 344525d..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_DTK_BIOS.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_3270pc.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_3270pc.ttf
deleted file mode 100644
index 94128ae..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_3270pc.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS-2x.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS-2x.ttf
deleted file mode 100644
index f200dba..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS-2x.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS-2y.ttf
deleted file mode 100644
index 9b8921f..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS.ttf
deleted file mode 100644
index 28b8f08..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_BIOS.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGA-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGA-2y.ttf
deleted file mode 100644
index e4502c0..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGA-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGA.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGA.ttf
deleted file mode 100644
index 9492e9f..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGA.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGAthin-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGAthin-2y.ttf
deleted file mode 100644
index 93a82ad..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGAthin-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGAthin.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGAthin.ttf
deleted file mode 100644
index 36a9f4c..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_CGAthin.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv-2x.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv-2x.ttf
deleted file mode 100644
index 432c47b..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv-2x.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv-2y.ttf
deleted file mode 100644
index 2877310..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv.ttf
deleted file mode 100644
index 4b4452b..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_Conv.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA8-2x.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA8-2x.ttf
deleted file mode 100644
index c02d600..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA8-2x.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA8.ttf
deleted file mode 100644
index 437d277..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA9-2x.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA9-2x.ttf
deleted file mode 100644
index a6843e5..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA9-2x.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA9.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA9.ttf
deleted file mode 100644
index de5bb0e..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_EGA9.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_ISO8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_ISO8.ttf
deleted file mode 100644
index 30e088f..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_ISO8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_ISO9.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_ISO9.ttf
deleted file mode 100644
index add9023..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_ISO9.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_MDA.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_MDA.ttf
deleted file mode 100644
index 0aae875..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_MDA.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PGC-2x.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PGC-2x.ttf
deleted file mode 100644
index 1c85c24..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PGC-2x.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PGC.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PGC.ttf
deleted file mode 100644
index 094c774..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PGC.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin1.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin1.ttf
deleted file mode 100644
index 8a35703..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin1.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin2.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin2.ttf
deleted file mode 100644
index c335fa8..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin2.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin3.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin3.ttf
deleted file mode 100644
index 16b34e2..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin3.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin4.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin4.ttf
deleted file mode 100644
index 729aab0..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_PS2thin4.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA8-2x.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA8-2x.ttf
deleted file mode 100644
index 5bf2dbb..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA8-2x.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA8.ttf
deleted file mode 100644
index a8284f1..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA9-2x.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA9-2x.ttf
deleted file mode 100644
index 030f79e..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA9-2x.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA9.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA9.ttf
deleted file mode 100644
index 9d3701c..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_IBM_VGA9.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ITT_BIOS-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ITT_BIOS-2y.ttf
deleted file mode 100644
index b1a51de..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ITT_BIOS-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ITT_BIOS.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ITT_BIOS.ttf
deleted file mode 100644
index 4c340d3..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ITT_BIOS.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Kaypro2K.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Kaypro2K.ttf
deleted file mode 100644
index 172292e..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Kaypro2K.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Kaypro2k-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Kaypro2k-2y.ttf
deleted file mode 100644
index e288f17..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Kaypro2k-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x14.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x14.ttf
deleted file mode 100644
index fd29478..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x14.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x16.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x16.ttf
deleted file mode 100644
index a2bd49f..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x16.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x8-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x8-2y.ttf
deleted file mode 100644
index f3941f1..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x8-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x8.ttf
deleted file mode 100644
index f743a7f..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_8x8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_9x14.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_9x14.ttf
deleted file mode 100644
index 87dab48..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_PhoenixEGA_9x14.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Phoenix_BIOS-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Phoenix_BIOS-2y.ttf
deleted file mode 100644
index 93eaa01..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Phoenix_BIOS-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Phoenix_BIOS.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Phoenix_BIOS.ttf
deleted file mode 100644
index 1951a28..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Phoenix_BIOS.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_225-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_225-2y.ttf
deleted file mode 100644
index aeb8de2..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_225-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_225.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_225.ttf
deleted file mode 100644
index 3e286ad..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_225.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_Mono.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_Mono.ttf
deleted file mode 100644
index ddeabbb..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_Mono.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_TV-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_TV-2y.ttf
deleted file mode 100644
index 68c0912..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_TV-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_TV.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_TV.ttf
deleted file mode 100644
index 0849794..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyNew_TV.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_225-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_225-2y.ttf
deleted file mode 100644
index 4c89369..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_225-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_225.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_225.ttf
deleted file mode 100644
index bddac89..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_225.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_TV-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_TV-2y.ttf
deleted file mode 100644
index 2878a7a..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_TV-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_TV.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_TV.ttf
deleted file mode 100644
index b4c11a7..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_TandyOld_TV.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ToshibaLCD_8x16.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ToshibaLCD_8x16.ttf
deleted file mode 100644
index c8285cb..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ToshibaLCD_8x16.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_ToshibaLCD_8x8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_ToshibaLCD_8x8.ttf
deleted file mode 100644
index 71fddb1..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_ToshibaLCD_8x8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_VGA_SquarePx.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_VGA_SquarePx.ttf
deleted file mode 100644
index ece1c32..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_VGA_SquarePx.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_VTech_BIOS-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_VTech_BIOS-2y.ttf
deleted file mode 100644
index 697cb82..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_VTech_BIOS-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_VTech_BIOS.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_VTech_BIOS.ttf
deleted file mode 100644
index e4aefce..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_VTech_BIOS.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x14.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x14.ttf
deleted file mode 100644
index 3de19a2..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x14.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x16.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x16.ttf
deleted file mode 100644
index fe580e9..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x16.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x8-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x8-2y.ttf
deleted file mode 100644
index 6b02cd8..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x8-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x8.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x8.ttf
deleted file mode 100644
index cac4b61..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_8x8.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_9x14.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_9x14.ttf
deleted file mode 100644
index 290874b..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_9x14.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_9x16.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_9x16.ttf
deleted file mode 100644
index 99764e3..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Verite_9x16.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700a-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700a-2y.ttf
deleted file mode 100644
index 570eefb..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700a-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700a.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700a.ttf
deleted file mode 100644
index fcd2982..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700a.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700b-2y.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700b-2y.ttf
deleted file mode 100644
index 212b7da..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700b-2y.ttf and /dev/null differ
diff --git a/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700b.ttf b/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700b.ttf
deleted file mode 100644
index 31a16de..0000000
Binary files a/fonts/Px437 (TrueType - DOS charset)/Px437_Wyse700b.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_AmstradPC1512-2y.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_AmstradPC1512-2y.ttf
deleted file mode 100644
index 091001c..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_AmstradPC1512-2y.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_AmstradPC1512.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_AmstradPC1512.ttf
deleted file mode 100644
index 248a001..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_AmstradPC1512.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS-2x.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS-2x.ttf
deleted file mode 100644
index 130bb4a..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS-2x.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS-2y.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS-2y.ttf
deleted file mode 100644
index 2a1ec89..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS-2y.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS.ttf
deleted file mode 100644
index 672aac7..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_BIOS.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGA-2y.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGA-2y.ttf
deleted file mode 100644
index f20e848..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGA-2y.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGA.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGA.ttf
deleted file mode 100644
index 11cbae7..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGA.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGAthin-2y.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGAthin-2y.ttf
deleted file mode 100644
index e8aa21e..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGAthin-2y.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGAthin.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGAthin.ttf
deleted file mode 100644
index bca6a64..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_CGAthin.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA8-2x.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA8-2x.ttf
deleted file mode 100644
index 5aeb931..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA8-2x.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA8.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA8.ttf
deleted file mode 100644
index 22983e3..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA8.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA9-2x.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA9-2x.ttf
deleted file mode 100644
index 66c93d8..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA9-2x.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA9.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA9.ttf
deleted file mode 100644
index d07ca5d..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_EGA9.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_MDA.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_MDA.ttf
deleted file mode 100644
index db3b7b2..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_MDA.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA8-2x.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA8-2x.ttf
deleted file mode 100644
index 6963c72..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA8-2x.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA8.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA8.ttf
deleted file mode 100644
index 0368d2b..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA8.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA9-2x.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA9-2x.ttf
deleted file mode 100644
index f159709..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA9-2x.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA9.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA9.ttf
deleted file mode 100644
index 53c6068..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_IBM_VGA9.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_225-2y.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_225-2y.ttf
deleted file mode 100644
index e52ba0d..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_225-2y.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_225.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_225.ttf
deleted file mode 100644
index f279c67..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_225.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_TV-2y.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_TV-2y.ttf
deleted file mode 100644
index 653a100..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_TV-2y.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_TV.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_TV.ttf
deleted file mode 100644
index d206e1d..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_TandyNew_TV.ttf and /dev/null differ
diff --git a/fonts/PxPlus (TrueType - extended charset)/PxPlus_VGA_SquarePx.ttf b/fonts/PxPlus (TrueType - extended charset)/PxPlus_VGA_SquarePx.ttf
deleted file mode 100644
index 9fe3e4a..0000000
Binary files a/fonts/PxPlus (TrueType - extended charset)/PxPlus_VGA_SquarePx.ttf and /dev/null differ
diff --git a/fonts/TopazPlusA1200Powerline.ttf b/fonts/TopazPlusA1200Powerline.ttf
deleted file mode 100644
index a9f22cc..0000000
Binary files a/fonts/TopazPlusA1200Powerline.ttf and /dev/null differ
diff --git a/fonts/TopazPlus_a1200_v1.0.ttf b/fonts/TopazPlus_a1200_v1.0.ttf
deleted file mode 100644
index 3bd7e14..0000000
Binary files a/fonts/TopazPlus_a1200_v1.0.ttf and /dev/null differ
diff --git a/fonts/TopazPlus_a500_v1.0.ttf b/fonts/TopazPlus_a500_v1.0.ttf
deleted file mode 100644
index 6d75ee1..0000000
Binary files a/fonts/TopazPlus_a500_v1.0.ttf and /dev/null differ
diff --git a/fonts/Topaz_a1200_v1.0.ttf b/fonts/Topaz_a1200_v1.0.ttf
deleted file mode 100644
index 2f7ec44..0000000
Binary files a/fonts/Topaz_a1200_v1.0.ttf and /dev/null differ
diff --git a/fonts/Topaz_a500_v1.0.ttf b/fonts/Topaz_a500_v1.0.ttf
deleted file mode 100644
index d141387..0000000
Binary files a/fonts/Topaz_a500_v1.0.ttf and /dev/null differ
diff --git a/fonts/Topaza500Powerline.ttf b/fonts/Topaza500Powerline.ttf
deleted file mode 100644
index 498cd7c..0000000
Binary files a/fonts/Topaza500Powerline.ttf and /dev/null differ
diff --git a/fonts/codeface b/fonts/codeface
deleted file mode 160000
index 67e1247..0000000
--- a/fonts/codeface
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67e12479572485cff55daa063207bc2be1f4a69a
diff --git a/fonts/mO'sOul_v1.0.ttf b/fonts/mO'sOul_v1.0.ttf
deleted file mode 100644
index 0950ab9..0000000
Binary files a/fonts/mO'sOul_v1.0.ttf and /dev/null differ
diff --git a/fonts/mOsOulPowerline.ttf b/fonts/mOsOulPowerline.ttf
deleted file mode 100644
index 64a9ec1..0000000
Binary files a/fonts/mOsOulPowerline.ttf and /dev/null differ
diff --git a/fonts/powerline-fonts.tar.xz b/fonts/powerline-fonts.tar.xz
deleted file mode 100644
index a2c1a86..0000000
Binary files a/fonts/powerline-fonts.tar.xz and /dev/null differ
diff --git a/fonts/t!s-af10.zip b/fonts/t!s-af10.zip
deleted file mode 100644
index 528b215..0000000
Binary files a/fonts/t!s-af10.zip and /dev/null differ
diff --git a/gbterm.sh b/gbterm.sh
deleted file mode 100755
index 9a7b9db..0000000
--- a/gbterm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-urxvtc -fn "xft:TopazPlus a600a1200a4000-:antialias=false" \
--fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
-+is -fg chartreuse \
--bg black \
--cr forestgreen
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..a81309c
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,16 @@
+[alias]
+   tree = !"git lg1"
+   lg = !"git lg1"
+   lg1 = !"git lg1-specific --all"
+   lg2 = !"git lg2-specific --all"
+   lg3 = !"git lg3-specific --all"
+
+   lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
+   lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
+   lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset)%n''          %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
+	
+[user]
+	name = HELLO I REQUIRE CHANGING 
+	email = THIS EMAIL IS ALL WHACKED
+[merge]
+	tool = emerge
diff --git a/pickfontrand.sh b/pickfontrand.sh
deleted file mode 100755
index 3bcab85..0000000
--- a/pickfontrand.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/zsh
-
-font=`fc-list | cut -d: -f2 | sort | uniq | shuf | dmenu -i -l 10`
-size=`echo what size|dmenu`
-st -f "$font-$size" -t "st : $font-$size" $@
diff --git a/pickfontrand2.sh b/pickfontrand2.sh
deleted file mode 100755
index 46eaca2..0000000
--- a/pickfontrand2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/zsh
-
-font=`fc-list | cut -d: -f2 | sort | uniq | shuf | dmenu -i -l 10`
-size=`echo what size|dmenu`
-/usr/local/bin/st -f "$font-$size" $@
diff --git a/pickfontst.sh b/pickfontst.sh
deleted file mode 100755
index 8aba191..0000000
--- a/pickfontst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/zsh
-# now uses a list I have made of available fonts that work well
-
-PICK=`cat ~/bin/shellfonts.list |dmenu -i -l 25 -fn "ProggySquareTTSZ" -p "ST: Pick Font"`
-SIZE=`echo 16,12,14,10,9,8,72 | sed s/,/\\\n/g | dmenu -p Size -fn mOsOul-16 -sb orange -sf navy`
-if [[ $PICK ]]; then
- FONT=$PICK:pixelsize="$SIZE":antialias=false:autohint=false
- echo st -f $FONT
- st -f $FONT
-fi
-
diff --git a/pickfontterm.sh b/pickfontterm.sh
deleted file mode 100755
index c83e470..0000000
--- a/pickfontterm.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/zsh
-# this may not work any longer with the way that arch has
-# redone the fc-list bit, if that's the case and you feel
-# like fixing it, fix it...
-
-PICK=`fc-list | sort |dmenu -i -l 25 -fn mOsOul -p Font`
-SIZE=`echo 10,12,14,16,9,8,72 | sed s/,/\\\n/g | dmenu -p Size -fn mOsOul-16 -sb orange -sf navy`
-if [ "$PICK" ]; then
- FONT=`echo $PICK | cut -d: -f2 | sed -e "s/^ /xft:/"`
-
- COLORS=('dodgerblue' 'chartreuse' 'aliceblue' 'forestgreen' 'burlywood' 'dark goldenrod' 'indian red' 'firebrick' 'Gainsboro' 'Misty Rose' 'Peach Puff' 'Seashell' 'Slate Gray' 'Tan' 'Tomato')
- DACOLN=$(( $RANDOM % ${#COLORS} ))
- FADECOLN=$(( $RANDOM % ${#COLORS} ))
- DACOL=${COLORS[$DACOLN]}
- FADECOLOR=${COLORS[$FADECOLN]}
- DAFADE=$(( $RANDOM % 25 ))
- DAFADE=$(( $DAFADE + 25 ))
- DASHADE=$(( $RANDOM % 50 ))
-# DASHADE=$(( $DAFADE + 75 ))
-
-#echo $DACOL : $DAFADE
-# amigaterm2.sh fontsize tintcolor fadepercent fadecolor cursorcolor extrashit
-#echo ----
-#echo urxvt -bc -rv -tr -sb +sr -g 80x42 -tint $TINTCOLOR -fade $DAFADE -fadecolor $FADECOLOR -tn xterm-256color -cr green -fn $FONT
-# echo \
- urxvtc -bc -rv -tr -sb +sr -g 80x42 -tint "$DACOL" -fade "$DAFADE" \
- -fadecolor "$FADECOLOR" -tn xterm-256color -cr green -sh "$DASHADE" \
- -fn "$FONT-$SIZE"
-fi
-
diff --git a/powerlevel_vars b/powerlevel_vars
new file mode 100644
index 0000000..8790f0f
--- /dev/null
+++ b/powerlevel_vars
@@ -0,0 +1,16 @@
+POWERLEVEL9K_MODE=nerdfont-complete
+POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( root_indicator ssh virtualenv context dir disk_usage ram newline vcs )
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status background_jobs battery os_icon time )
+POWERLEVEL9K_BATTERY_STAGES=(
+   $'▏    ▏' $'▎    ▏' $'▍    ▏' $'▌    ▏' $'▋    ▏' $'▊    ▏' $'▉    ▏' $'█    ▏'
+   $'█▏   ▏' $'█▎   ▏' $'█▍   ▏' $'█▌   ▏' $'█▋   ▏' $'█▊   ▏' $'█▉   ▏' $'██   ▏'
+   $'██   ▏' $'██▎  ▏' $'██▍  ▏' $'██▌  ▏' $'██▋  ▏' $'██▊  ▏' $'██▉  ▏' $'███  ▏'
+   $'███  ▏' $'███▎ ▏' $'███▍ ▏' $'███▌ ▏' $'███▋ ▏' $'███▊ ▏' $'███▉ ▏' $'████ ▏'
+   $'████ ▏' $'████▎▏' $'████▍▏' $'████▌▏' $'████▋▏' $'████▊▏' $'████▉▏' $'█████▏' )
+POWERLEVEL9K_VCS_GIT_GITLAB_ICON=🤘
+POWERLEVEL9K_USER_ROOT_BACKGROUND=red
+POWERLEVEL9K_USER_ROOT_FOREGROUND=white
+POWERLEVEL9K_DIR_DEFAULT_BACKGROUND=202
+POWERLEVEL9K_DIR_DEFAULT_FOREGROUND=020
+POWERLEVEL9K_HOST_REMOTE_BACKGROUND=016
+POWERLEVEL9K_HOST_REMOTE_FOREGROUND=082
diff --git a/powerline_init b/powerline_init
new file mode 100644
index 0000000..09ee798
--- /dev/null
+++ b/powerline_init
@@ -0,0 +1,16 @@
+function powerline_precmd() {
+    PS1="$(~/sturf/banga-powerline/powerline-shell.py $? --colorize-hostname --cwd-max-depth 3 --cwd-max-dir-size 6 --shell zsh 2> /dev/null)"
+}
+
+function install_powerline_precmd() {
+  for s in "${precmd_functions[@]}"; do
+    if [ "$s" = "powerline_precmd" ]; then
+      return
+    fi
+  done
+  precmd_functions+=(powerline_precmd)
+}
+
+if [ "$TERM" != "linux" ]; then
+    install_powerline_precmd
+fi
diff --git a/randterm.sh b/randterm.sh
deleted file mode 100755
index 422f9e3..0000000
--- a/randterm.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/zsh
-COLORS=("dodgerblue" "chartreuse" "aliceblue" "forestgreen" "burlywood" "dark goldenrod" "indian red" "firebrick" "Gainsboro" "Misty Rose" "Peach Puff" "Seashell" "Slate Gray" "Tan" "Tomato")
-DACOLN=$(( $RANDOM % ${#COLORS} ))
-DACOL=${COLORS[$DACOLN]}
-
-DAFADE=$(( 25 + ($RANDOM % 25 ) ))
-
-DAFADEN=$(( $RANDOM % ${#COLORS} ))
-DAFCOL=${COLORS[$DAFADEN]}
-
-DASHP=$(( $RANDOM % 25 ))
-DASHP=$(( $DASHP + 10 ))
-
-#DAFADE=$(( $DAFADE + 50 ))
-#Help: /home/andrew/bin//amigaterm2.sh fontsize tintcolor fadepercent fadecolor cursorcolor extrashit
-~/bin/amigaterm2.sh 10 "$DACOL" "$DAFADE" "$DAFCOL" green -sh "$DASHP"  -pe selection-to-clipboard "$@"
diff --git a/rwterm.sh b/rwterm.sh
deleted file mode 100755
index d30d2af..0000000
--- a/rwterm.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-urxvtc -fn "xft:TopazPlus a600a1200a4000-:antialias=false" \
--fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
-+is -fg red \
--bg ghostwhite \
--cr gold
-
diff --git a/shellfonts.list b/shellfonts.list
deleted file mode 100644
index cc992d5..0000000
--- a/shellfonts.list
+++ /dev/null
@@ -1,76 +0,0 @@
-MicroKnightPlus for Powerline
-TopazPlus a500a1000a2000 for Powerline
-TopazPlus a600a1200a4000 for Powerline
-mOsOul for Powerline
-Code New Roman
-Monofur
-Aurulent Sans Mono
-Dina ttf 10px-14
-Envy Code R
-Fantasque Sans Mono
-Hermit
-Luculent
-Monoid
-
-CodingFontTobi
-Clean
-Crisp
-Sudo
-MonteCarlo Fixed 12
-ProggyCleanTT
-ProggyCleanTTSZBP
-ProggySmallTT
-ProggySquareTT
-ProggySquareTTSZ
-ProggyTinySZ
-ProggyTinyTT
-ProggyTinyTTSZ
-progsole
-
-P0T\-NOoDLE for Powerline
-CPMono_v07,CPMono_v07 Bold
-CPMono_v07,CPMono_v07 Plain
-Cutive Mono-16
-Meslo LG M DZ
-Metrickal
-PixelCarnageMonoTT:autohint=true:antialias=true:pixelsize=16
-Share\-TechMonoTrue
-Ubuntu Mono
-Verily Serif Mono
-
-AverageMono
-BPmono
-ElroNet Monospace
-monoOne
-Bront
-CamingoCode
-Anonymous Pro
-Office Code Pro
-Office Code Pro D
-Office Code Pro D,Office Code Pro D Bold
-Consola Mono
-Edlo
-Oxygen Mono
-Fira Mono
-Hack
-Inconsolata\-dz
-LucidaTypewriter
-MonoMMM_5
-Panic Sans
-NotCourierSans
-MonoSpatial
-NanumGothic_Coding,\353\202\230\353\210\224\352\263\240\353\224\225_\354\275\224\353\224\251
-saxmono
-SmallTypeWriting
-Source Code Prog
-Source Code Pro,Source Code Pro Black
-SV Basic Manual,SVI Basic Manual
-Whois
-
-Times
-Fixed
-Terminus
-DejaVu Sans Mono
-Bitstream Vera Sans Mono
-Liberation Mono
-ProFontWindows
diff --git a/solarizedterm.sh b/solarizedterm.sh
deleted file mode 100755
index 8f7d3c8..0000000
--- a/solarizedterm.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/zsh
-xrdb ~/xresources/solorized_xresources
-
-urxvtc -fn "xft:TopazPlus a600a1200a4000 for Powerline-12:antialias=false" \
--fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
-+is -cr "#cb4b16"
-
-if [[ $? != 0 ]]; then
-	urxvtd -f -o -q
-	urxvtc -fn "xft:TopazPlus a600a1200a4000 for Powerline-12:antialias=false" \
-	-fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \
-	+is -cr "#cb4b16"
-fi
-
-xrdb ~/xresources/standard_xresources
diff --git a/tmux.conf b/tmux.conf
index 774f750..5eb92c2 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,109 +1,42 @@
-# Truck's updated 2016 tmux config
-
-# fix the prefix to control-a and remap control-a to work like screen
+# start up with screen keys
 set -g prefix C-a
 unbind C-b
 bind-key a send-prefix
 bind-key C-a last-window
 
-# faster response
-set -sg escape-time 0
-
-# colors woot
-set -g default-terminal "screen-256color"
-
-# 1-based window numbering
-set -g base-index 1
-setw -g pane-base-index 1
-
-# reloader
-bind r source-file ~/.tmux.conf \; display "Ok! I'm Reloaded!"
-
-# splittage
-bind | split-window -h
-bind - split-window -v
-
-# I dunno about this vi shit, yeah fuck that, be more awesome.
-# wasd. cuz.
-bind C-w select-pane -U
-bind C-a select-pane -L
-bind C-s select-pane -D
-bind C-d select-pane -R
-
-# Resize
-bind -r W resize-pane -U 5
-bind -r A resize-pane -L 5
-bind -r S resize-pane -D 5
-bind -r D resize-pane -R 5
-
-# now that messed up d/D, so redo them on e/E
-bind -r E choose-client
-bind -r e detach-client
-
-# cycle thru windows, which seems... no. bullshit. that is p and n. period.
-
-#initial mouse on
-set -g mouse on
-
-# choose colors wisely! why the fuck did I say that
-set -g status-fg colour202
-set -g status-bg colour17
-set -g window-status-fg colour184
-set -g window-status-bg colour234
-
-# pane colors
-
-set -g pane-border-bg colour238
-set -g pane-border-fg colour249
-set -g pane-active-border-bg colour029
-set -g pane-active-border-fg colour023
-
-# message colors
-
-set -g message-bg colour214
-set -g message-fg colour022
-
-#status bar
-# H-hostname, h, hostname without domain  ##- a #
-# Window:
-# F - Flag, I - Index  T- Title  W - Name
-# Pane index: P  Screen index: S
-# #(shell command result line 1)
-#[colorchangestuffs]
-
-# if not using powerline
-
+# #F: flag, #I, window index, #W window name, #P pane, #D pane unique id, #S session, #T pane title,
+set -g status-left "#[fg=colour005,bg=colour107]#S🍱 #I #[bg=colour156,fg=colour20]🍕#P(#D)#[fg=colour18,bg=colour113] 📛 #W "
 set -g status-left-length 40
-set-window-option -g status-left "Sn:#S "
-set-window-option -g status-left-fg colour166
-set-window-option -g status-left-bg colour239
-set-window-option -g status-right "[#F] #H %H:%M %Y/%m/%e %Z"
-set-window-option -g status-right-fg colour254
-set-window-option -g status-right-bg colour236
-set-window-option -g window-status-format " #I: {#D-#W} "
-set-window-option -g window-status-current-format " #I: {#D-#W} "
-set-window-option -g window-status-current-fg green
-set-window-option -g window-status-current-bg black
-
-# if using powerline
-#include ~/.local/lib/python2.7/site-packages/powerline/tmux/powerline.conf
+set -g status-right "%Y/%m/%e %H:%M %Z"
 
 setw -g monitor-activity on
 set -g visual-activity on
 
 set -g status-justify left
 
-# mouse fixin's
+set -g status-fg colour151
+set -g status-bg colour058
 
-# toggle mousemode on/off
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-pain-control'
+set -g @plugin 'tmux-plugins/tmux-urlview'
+set -g @plugin 'jimeh/tmux-themepack'
+set -g @themepack 'powerline/double/green'
 
-bind m \
- set -g mouse on\; \
- display 'M: ON'
 
-bind M \
- set -g mouse off \; \
- display 'M: OFF'
+# Other examples:
+# set -g @plugin 'github_username/plugin_name'
+# set -g @plugin 'git@github.com/user/plugin'
+# set -g @plugin 'git@bitbucket.com/user/plugin'
 
-# my compose script
-bind C-v command-prompt -p compose "if '~/bin/tmuxcompose/compose.py \\%% | tmux load-buffer -' 'pasteb -d' 'display notfound'"
+# set up tmux plugin manager
+# git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+# or install tmux-plugin-manager and tmux-themepack-jimeh via apt
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+#run '~/.tmux/plugins/tpm/tpm'
+run '/usr/share/tmux-plugin-manager/tpm'
+
+set-option -ga terminal-overrides ",xterm-256color:Tc"
diff --git a/tmux.conf.2016 b/tmux.conf.2016
index 09c8c8d..a96c7ad 100644
--- a/tmux.conf.2016
+++ b/tmux.conf.2016
@@ -1,4 +1,4 @@
-# Truck's tmux config, started with the tmux productive book.
+# Truck's updated 2016 tmux config
 
 # fix the prefix to control-a and remap control-a to work like screen
 set -g prefix C-a
@@ -24,56 +24,72 @@ bind | split-window -h
 bind - split-window -v
 
 # I dunno about this vi shit, yeah fuck that, be more awesome.
-# this not only is ijkm, proper movement, but adds tab and enter to the mix.
-bind C-i select-pane -U
-bind C-j select-pane -L
-bind C-k select-pane -R
-bind C-m select-pane -D
+# wasd. cuz.
+bind C-w select-pane -U
+bind C-a select-pane -L
+bind C-s select-pane -D
+bind C-d select-pane -R
+
+# Resize
+bind -r W resize-pane -U 5
+bind -r A resize-pane -L 5
+bind -r S resize-pane -D 5
+bind -r D resize-pane -R 5
+
+# now that messed up d/D, so redo them on e/E
+bind -r E choose-client
+bind -r e detach-client
 
 # cycle thru windows, which seems... no. bullshit. that is p and n. period.
 
-# what I _do_ want is resize on those, like in awesome.
-bind -r H resize-pane -L 5
-bind -r L resize-pane -R 5
-bind -r I resize-pane -U 5
-bind -r M resize-pane -D 5
-
-#set -g mouse-utf8 on
-set -g mouse on
-#mouse select-resize
-#set -g mouse-select-pane on
-#set -g mouse-resize-pane on
-#set -g mouse-select-window on
-
+#initial mouse on
+set -g mouse-utf8 on
+set -g mouse-select-window on
+set -g mouse-select-pane on
+set -g mouse-resize-pane on
 
 # choose colors wisely! why the fuck did I say that
 set -g status-fg colour202
 set -g status-bg colour17
 set -g window-status-fg colour184
 set -g window-status-bg colour234
-set -g pane-border-fg colour61
-set -g pane-border-bg colour8
-set -g pane-active-border-fg colour6
-set -g pane-active-border-bg colour24
 
-#set -g message-fg colour190
-#set -g message-bg colour18
-set -g message-bg colour160
-set -g message-fg colour252
+# pane colors
+
+set -g pane-border-bg colour238
+set -g pane-border-fg colour249
+set -g pane-active-border-bg colour029
+set -g pane-active-border-fg colour023
+
+# message colors
+
+set -g message-bg colour214
+set -g message-fg colour022
 
 #status bar
 # H-hostname, h, hostname without domain  ##- a #
 # Window:
 # F - Flag, I - Index  T- Title  W - Name
-# Pane index: P  Screen index: S  
+# Pane index: P  Screen index: S
 # #(shell command result line 1)
 #[colorchangestuffs]
 
-#set -g status-utf8 on
-#set -g status-left "#[fg=colour83]#S ䷀#[bg=colour22]#I#[bg=colour156,fg=colour20]𝕡#P#[fg=colour150,bg=colour55] ≋ #W"
-#set -g status-left-length 40
-#set -g status-right "%Y/%m/%e %H:%M %Z"
-source "/home/truck/.local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf"
+# if not using powerline
+
+set -g status-left-length 40
+set-window-option -g status-left "Sn:#S "
+set-window-option -g status-left-fg colour166
+set-window-option -g status-left-bg colour239
+set-window-option -g status-right "[#F] #H %H:%M %Y/%m/%e %Z"
+set-window-option -g status-right-fg colour254
+set-window-option -g status-right-bg colour236
+set-window-option -g window-status-format " #I: {#D-#W} "
+set-window-option -g window-status-current-format " #I: {#D-#W} "
+set-window-option -g window-status-current-fg green
+set-window-option -g window-status-current-bg black
+
+# if using powerline
+#include ~/.local/lib/python2.7/site-packages/powerline/tmux/powerline.conf
 
 setw -g monitor-activity on
 set -g visual-activity on
@@ -82,15 +98,21 @@ set -g status-justify left
 
 # mouse fixin's
 
-# the blog where this came from is fuckign bullshit with it's copy paste blocking
-# anyway. toggle mousemode on/off
+# toggle mousemode on/off
 
 bind m \
- set -g mouse on\; \
+ setw -g mode-mouse on\; \
+ set -g mouse-select-pane on\; \
+ set -g mouse-select-window on\; \
+ set -g mouse-resize-pane on\; \
  display 'M: ON'
 
 bind M \
- set -g mouse off \; \
+ setw -g mode-mouse off \; \
+ set -g mouse-select-pane off\; \
+ set -g mouse-select-window off\; \
+ set -g mouse-resize-pane off\; \
  display 'M: OFF'
 
+# my compose script
 bind C-v command-prompt -p compose "if '~/bin/tmuxcompose/compose.py \\%% | tmux load-buffer -' 'pasteb -d' 'display notfound'"
diff --git a/zgen b/zgen
index 09f5425..ffd3f50 160000
--- a/zgen
+++ b/zgen
@@ -1 +1 @@
-Subproject commit 09f542515e20ac655a4aa429cf9604fe698ccf42
+Subproject commit ffd3f50addf7a0106d9ea199025eb99efbb858f4
diff --git a/zshrc b/zshrc
index 71befc6..079c93c 100644
--- a/zshrc
+++ b/zshrc
@@ -1,19 +1,31 @@
+[[ $TERM == "dumb" ]] && unsetopt zle && PS1='$ ' && return
+
 echo "Loading zgen..."
 source ~/bin/zgen/zgen.zsh
-
 source ~/bin/fixcolors
+
 HIST_STAMPS="yyyy-mm-dd"
 HISTFILE=~/.histfile
 HISTSIZE=2000
 SAVEHIST=2000
 setopt appendhistory autocd extendedglob
-xset -b
+
+if [ -x /usr/bin/xset ]; then
+	xset -b
+fi
+
+if [[ ${TERM} == st* ]]; then
+	if [ ! -e /usr/share/terminfo/s/st-256color ]; then
+		export TERM=xterm-256color
+	fi
+fi
+
 unsetopt beep
 bindkey -e
 export LESS="-X -R -F"
 alias http='python -m http.server'
 export PATH=$HOME/bin:/usr/local/bin:$PATH
-alias t=todo.sh
+
 export EDITOR=mg
 
 autoload insert-composed-char
@@ -46,12 +58,14 @@ if ! zgen saved; then
 	zgen save
 fi
 
+#prompt fire 178 142 106 070 034
+
 . ~/bin/aliases
-
-prompt fire 125 234 084 054 020
-
-# powerline (arch location)
-#. /usr/share/zsh/site-contrib/powerline.zsh
+if [[ ${TERM} == linux ]]; then
+	prompt pure
+else
+	prompt powerlevel10k
+fi
 
 unalias rm
 unalias mv