diff --git a/Brewfile b/Brewfile
index a1c5000..19c251d 100644
--- a/Brewfile
+++ b/Brewfile
@@ -185,7 +185,7 @@ brew "twilio/brew/twilio"
 brew "typescript"
 brew "unrar"
 brew "watchman"
-brew "whois"
+brew "whois", link: true
 brew "wireguard-tools"
 brew "wireguard-go"
 brew "wp-cli"
diff --git a/git/.gitconfig b/git/.gitconfig
index e91a159..881a65d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -22,6 +22,7 @@
 	signingkey = 3BC6E5776BF379D36F6714802B0C9CF251E69A39
 [push]
 	default = current
+	gpgSign = if-asked
 [pull]
 	rebase = true
 [diff]
@@ -45,3 +46,5 @@
 	required = true
 [init]
 	defaultBranch = main
+[mergetool]
+	keepBackup = true
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 4f56dd1..7bbde09 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -40,7 +40,7 @@ Host tufts
 
 Host code
   HostName code.jarv.is
-  User jake
+  User root
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 6ea81f9..64b5eec 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -31,16 +31,14 @@ plugins=(
   zsh-autosuggestions
 )
 
-# Perform compinit only once a day
-# https://gist.github.com/ctechols/ca1035271ad134841284
+# Perform compinit only once a day for speed
+# https://gist.github.com/ctechols/ca1035271ad134841284#gistcomment-2308206
 autoload -Uz compinit
-if [[ -n ${ZDOTDIR}/.zcompdump(\#qN.mh+24) ]]; then
+for dump in ~/.zcompdump(N.mh+24); do
+  echo "reloading compinit"
   compinit
-  compdump
-else
-  compinit -C
-fi;
-
+done
+compinit -C
 
 # Load everything!
 source $ZSH/oh-my-zsh.sh
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 0d9afb4..bed3f8b 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -52,8 +52,9 @@ update() {
 
   echo -e "${YELLOW}Updating Homebrew formulae and casks...${NC}"
   brew update
+  # git -C "/usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask" fetch --unshallow
   brew upgrade
-  brew cask upgrade
+  brew upgrade --cask
   brew cleanup
 
   echo -e "${YELLOW}Updating NPM/Yarn packages...${NC}"
@@ -67,16 +68,20 @@ update() {
   gem upgrade --user-install
   gem cleanup
 
+  # https://stackoverflow.com/a/3452888
+  echo -e "${YELLOW}Updating pip packages...${NC}"
+  pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip install -U
+
   echo -e "${YELLOW}Updating Composer packages...${NC}"
   composer global update
 
   echo -e "${YELLOW}Updating Oh-My-ZSH...${NC}"
-  upgrade_oh_my_zsh
+  omz update
 
-  # echo -e "${YELLOW}Updating MAS apps...${NC}"
+  echo -e "${YELLOW}Updating MAS apps...${NC}"
   mas upgrade
 
-  # echo -e "${YELLOW}Updating macOS system...${NC}"
+  echo -e "${YELLOW}Updating macOS system...${NC}"
   sudo softwareupdate -ia --include-config-data
 }
 
diff --git a/zsh/path.zsh b/zsh/path.zsh
index 2362176..56646e4 100644
--- a/zsh/path.zsh
+++ b/zsh/path.zsh
@@ -20,7 +20,6 @@ export PATH="/opt/metasploit-framework/bin:$PATH"
 # export PATH="/usr/local/opt/curl/bin:$PATH"
 export PATH="/usr/local/opt/curl-openssl/bin:$PATH"
 
-
 # Rust/Cargo
 export PATH="$HOME/.cargo/bin:$PATH"
 
@@ -29,7 +28,8 @@ export PATH="$HOME/.cargo/bin:$PATH"
 # [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 
 # yarn
-export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+export PATH="$HOME/.yarn/bin:$PATH"
+export PATH="$HOME/.config/yarn/global/node_modules/.bin:$PATH"
 
 # pyenv
 if command -v pyenv 1>/dev/null 2>&1; then
@@ -45,6 +45,3 @@ fi
 
 # Google Cloud SDK
 [ -f /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc ] && source /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc
-
-# added by travis gem
-[ -f /Users/jake/.travis/travis.sh ] && source /Users/jake/.travis/travis.sh
diff --git a/zsh/plugins/zsh-syntax-highlighting b/zsh/plugins/zsh-syntax-highlighting
index 4cf464f..1715f39 160000
--- a/zsh/plugins/zsh-syntax-highlighting
+++ b/zsh/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit 4cf464f843902b6e1e2778b85b70f4c098789b6f
+Subproject commit 1715f39a4680a27abd57fc30c98a95fdf191be45