diff --git a/chezmoi/dot_zshrc b/chezmoi/dot_zshrc
index 98e85be..6c4fcc1 100644
--- a/chezmoi/dot_zshrc
+++ b/chezmoi/dot_zshrc
@@ -102,6 +102,8 @@ SAVEHIST=10485760
 bindkey '^R' history-incremental-search-backward
 bindkey -e
 zstyle ':completion:*' menu select
+# case-insensitive,partial-word and then substring completion
+zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
 bindkey '^[[Z' reverse-menu-complete
 
 export TERM='xterm-256color'
diff --git a/chezmoi/dot_zshrc.d/executable_upgrade_system.sh b/chezmoi/dot_zshrc.d/executable_upgrade_system.sh
index 90be455..38f7ecb 100644
--- a/chezmoi/dot_zshrc.d/executable_upgrade_system.sh
+++ b/chezmoi/dot_zshrc.d/executable_upgrade_system.sh
@@ -20,7 +20,7 @@ upgrade_system() {
 
 				# Debian/Ubuntu
 				if command -v apt &> /dev/null; then
-					sudo sh -c 'apt update && apt upgrade'
+					sudo "$SHELL" -c 'apt update && apt upgrade'
 				fi
 
 				# Fedora
@@ -41,24 +41,6 @@ upgrade_system() {
 			nvim -c 'PaqSync' -c 'sleep 5' -c 'TSUpdateSync' -c 'sleep 5' -c 'qa'
 		fi
 
-		(
-			for DIR in "$ZSH"/custom/{themes,plugins}/*/; do
-				(
-					cd "${DIR}"
-					[ -d .git ] || exit 0
-					git pull
-				)
-			done
-		)
-
-		(
-			cd "${HOME}/.tmux"
-			git pull
-			if [ -n "${TMUX:-}" ]; then
-				tmux source-file "${HOME}/.tmux.conf"
-			fi
-		)
-
 		if command -v fwupdmgr &> /dev/null; then
 			fwupdmgr refresh
 			fwupdmgr upgrade