diff --git a/bin/install_tool b/bin/install_tool
index e532c9a..8a9538e 100755
--- a/bin/install_tool
+++ b/bin/install_tool
@@ -242,6 +242,8 @@ case ${TOOL} in
          udevadm control --reload-rules"
     ;;
   pm3iceman)
+    # arch:
+    # sudo pacman -Syu git base-devel readline bzip2 lz4 arm-none-eabi-gcc arm-none-eabi-newlib qt5-base bluez python gd --needed
     install_pkgs git ca-certificates build-essential pkg-config \
       libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev \
       libbz2-dev libbluetooth-dev libpython3-dev libssl-dev
diff --git a/bin/setup/spicerandr.sh b/bin/setup/spicerandr.sh
new file mode 100644
index 0000000..22ce3ea
--- /dev/null
+++ b/bin/setup/spicerandr.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -ue
+
+cat >/usr/local/bin/x-resize <<"EOF"
+#!/bin/sh
+PATH=/usr/bin:/bin:/usr/local/bin
+desktopuser=$(/bin/ps -ef  | /bin/grep -oP '^\w+ (?=.*vdagent( |$))') || exit 0
+export DISPLAY=:0
+export XAUTHORITY=$(eval echo "~$desktopuser")/.Xauthority
+/usr/bin/xrandr --output $(/usr/bin/xrandr | awk '/ connected/{print $1; exit; }') --auto
+EOF
+chmod 755 /usr/local/bin/x-resize
+
+cat >/etc/udev/rules.d/50-resize.rules <<"EOF"
+ACTION=="change",KERNEL=="card0", SUBSYSTEM=="drm", RUN+="/usr/local/bin/x-resize"
+EOF
+chmod 644 /etc/udev/rules.d/50-resize.rules
diff --git a/dotfiles/aliases b/dotfiles/aliases
index 859c6cf..66b04d6 100755
--- a/dotfiles/aliases
+++ b/dotfiles/aliases
@@ -52,7 +52,7 @@ alias ipy="ipython3"
 alias bc="command bc -q"
 
 # Get a decently readable df
-alias dfh="df -h -x tmpfs -x devtmpfs"
+alias dfh="df -h -x tmpfs -x devtmpfs -x squashfs -x fuse -x efivarfs"
 
 # Clear the GPG agent
 alias clear-gpg-agent="echo RELOADAGENT | gpg-connect-agent"
diff --git a/dotfiles/config/Code/User/settings.json b/dotfiles/config/Code/User/settings.json
new file mode 100644
index 0000000..2404870
--- /dev/null
+++ b/dotfiles/config/Code/User/settings.json
@@ -0,0 +1,4 @@
+{
+    "editor.accessibilitySupport": "off",
+    "telemetry.telemetryLevel": "off"
+}
\ No newline at end of file
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 5bfab41..f806c0a 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -1,5 +1,6 @@
 [user]
   name = David Tomaschik
+  email = david@systemoverlord.com
   signingKey = 0x5DEA789B
 
 [core]
diff --git a/dotfiles/npmrc b/dotfiles/npmrc
new file mode 100644
index 0000000..dc3f6fb
--- /dev/null
+++ b/dotfiles/npmrc
@@ -0,0 +1 @@
+prefix = ${HOME}/.npm-packages
diff --git a/dotfiles/shenv b/dotfiles/shenv
index 86ee7cb..2dc1634 100755
--- a/dotfiles/shenv
+++ b/dotfiles/shenv
@@ -6,7 +6,7 @@ umask 027
 # Paths and preferences
 export PYTHONPATH="$HOME/.python:$PYTHONPATH"
 export GOPATH="$HOME/go:$HOME/Projects/Go:/usr/share/gocode"
-export PATH="$HOME/bin:$HOME/bin/tools:/sbin:/usr/sbin:$PATH:$HOME/go/bin"
+export PATH="$HOME/bin:$HOME/bin/tools:/sbin:/usr/sbin:$PATH:$HOME/go/bin:$HOME/.npm-packages/bin"
 export VISUAL=vim
 export EDITOR=vim
 export DEBEMAIL="david@systemoverlord.com"
diff --git a/dotfiles/vim/pack/matir/opt/solarized8 b/dotfiles/vim/pack/matir/opt/solarized8
index 7b63990..6178a07 160000
--- a/dotfiles/vim/pack/matir/opt/solarized8
+++ b/dotfiles/vim/pack/matir/opt/solarized8
@@ -1 +1 @@
-Subproject commit 7b6399093c090ef931e9a4ba031bff90fb7c8de1
+Subproject commit 6178a07f442a1fe559673cef6ac2b7031ab21edb
diff --git a/dotfiles/vim/pack/matir/start/editorconfig b/dotfiles/vim/pack/matir/start/editorconfig
index 8f6eba5..8b7da79 160000
--- a/dotfiles/vim/pack/matir/start/editorconfig
+++ b/dotfiles/vim/pack/matir/start/editorconfig
@@ -1 +1 @@
-Subproject commit 8f6eba5fd6c306e0480ea72917902a2bde162d73
+Subproject commit 8b7da79e9daee7a3f3a8d4fe29886b9756305aff
diff --git a/dotfiles/vim/pack/matir/start/fugitive b/dotfiles/vim/pack/matir/start/fugitive
index 2a53d79..64d6caf 160000
--- a/dotfiles/vim/pack/matir/start/fugitive
+++ b/dotfiles/vim/pack/matir/start/fugitive
@@ -1 +1 @@
-Subproject commit 2a53d7924877b38b3d82fba188fd9053bfbc646e
+Subproject commit 64d6cafb9dcbacce18c26d7daf617ebb96b273f3
diff --git a/dotfiles/vim/pack/matir/start/surround b/dotfiles/vim/pack/matir/start/surround
index f51a26d..3d188ed 160000
--- a/dotfiles/vim/pack/matir/start/surround
+++ b/dotfiles/vim/pack/matir/start/surround
@@ -1 +1 @@
-Subproject commit f51a26d3710629d031806305b6c8727189cd1935
+Subproject commit 3d188ed2113431cf8dac77be61b842acb64433d9
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index bfa1908..091a158 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -168,4 +168,7 @@ if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
 if test -f "${HOME}/.zprompt" ; then
   THEME=${THEME:=$(cat "${HOME}/.zprompt")}
 fi
+if command -v starship >/dev/null 2>&1 ; then
+  : ${THEME:=starship}
+fi
 prompt "${THEME:-matir}" >/dev/null 2>&1
diff --git a/dotfiles/zshrc.d/functions.zsh b/dotfiles/zshrc.d/functions.zsh
index e6eff8f..8997b98 100644
--- a/dotfiles/zshrc.d/functions.zsh
+++ b/dotfiles/zshrc.d/functions.zsh
@@ -5,18 +5,18 @@ function dumpenv {
 if test -x "/sbin/starship" ; then
   _STARSHIP_PATH="/sbin/starship"
   function starship_prompt {
-    eval $(/sbin/starship init zsh)
+    eval "$(/sbin/starship init zsh)"
   }
 elif test -x "${HOME}/tools/starship/starship" ; then
   _STARSHIP_PATH="${HOME}/tools/starship/starship"
   function starship_prompt {
-    eval $($HOME/tools/starship/starship init zsh)
+    eval "$($HOME/tools/starship/starship init zsh)"
   }
 fi
 if test -f ${HOME}/.zprompt ; then
   if test "$(cat ${HOME}/.zprompt)" = "starship" ; then
     if test -n "${_STARSHIP_PATH:-}" ; then
-      eval $(${_STARSHIP_PATH} init zsh)
+      eval "$(${_STARSHIP_PATH} init zsh)"
     fi
   fi
 fi
@@ -25,3 +25,13 @@ unset _STARSHIP_PATH
 function hashall {
   tee >(md5sum) | tee >(sha1sum) | sha256sum
 }
+
+function rtmux {
+  if [ "$#" -lt 1 ] ; then
+    echo "Usage: $0 <host> [tmux args]" >&2
+    return 1
+  fi
+  HOST="${1}"
+  shift
+  ssh -t ${HOST} -- tmux "$@"
+}
diff --git a/udev/99-saleae.rules b/udev/99-saleae.rules
index 4e060a9..103d1b3 100644
--- a/udev/99-saleae.rules
+++ b/udev/99-saleae.rules
@@ -1,14 +1,11 @@
-# Rules for the Saleae Logic analyzer to allow to run the programs a normal user
-# being part of the plugdev group. Simply copy the file to /etc/udev/rules.d/
-# and plug the device
+# Saleae Logic Analyzer
+# This file should be installed to /etc/udev/rules.d so that you can access the Logic hardware without being root
+#
+# type this at the command prompt: sudo cp 99-SaleaeLogic.rules /etc/udev/rules.d
 
-BUS!="usb", ACTION!="add", SUBSYSTEM!=="usb_device", GOTO="saleae_logic_rules_end"
-
-# Saleae Logic analyzer (USB Based)
-# Bus 006 Device 006: ID 0925:3881 Lakeview Research
-# Bus 001 Device 009: ID 21a9:1004 Product: Logic S/16, Manufacturer: Saleae LLC
-
-ATTR{idVendor}=="0925", ATTR{idProduct}=="3881", MODE="664", GROUP="plugdev"
-ATTR{idVendor}=="21a9", ATTR{idProduct}=="1004", MODE="664", GROUP="plugdev"
-
-LABEL="saleae_logic_rules_end"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0925", ATTR{idProduct}=="3881", MODE="0666"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1001", MODE="0666"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1003", MODE="0666"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1004", MODE="0666"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1005", MODE="0666"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1006", MODE="0666"
diff --git a/vscode_extensions b/vscode_extensions
new file mode 100644
index 0000000..5c53e90
--- /dev/null
+++ b/vscode_extensions
@@ -0,0 +1,12 @@
+golang.go
+ms-azuretools.vscode-docker
+ms-python.debugpy
+ms-python.python
+ms-python.vscode-pylance
+ms-toolsai.jupyter
+ms-toolsai.jupyter-keymap
+ms-toolsai.jupyter-renderers
+ms-toolsai.vscode-jupyter-cell-tags
+ms-toolsai.vscode-jupyter-slideshow
+ms-vscode-remote.remote-containers
+p1c2u.docker-compose