diff --git a/.config/zsh/environment##template b/.config/zsh/environment##template
index ebbd7ed..0d738f0 100644
--- a/.config/zsh/environment##template
+++ b/.config/zsh/environment##template
@@ -16,6 +16,8 @@ export NVM_DIR=$HOME/.nvm
 export CLICOLOR=1
 export HOMEBREW_BUNDLE_DUMP_NO_VSCODE=1
 
+{% endif %}
+
 {% if yadm.class == "Work" %}
 export NODE_EXTRA_CA_CERTS=$HOME/.config/target-certs/tgt-ca-bundle.crt
 export VAULT_ADDR=https://prod.vault.target.com:443
@@ -31,5 +33,3 @@ export VPN_USERNAME="op://Target/Target Credentials/username"
 export VPN_PASSWORD="op://Target/Target Credentials/password"
 
 {% endif %}
-
-{% endif %}
diff --git a/.zshrc b/.zshrc
index 971b3f9..7e9ba9c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -79,9 +79,9 @@ prompt pure
 if [ "$system_type" = "Darwin" ]; then
 	[ -f ~/.config/op/plugins.sh ] && source ~/.config/op/plugins.sh
 	[ -e "${HOME}/.iterm2_shell_integration.zsh" ] && source "${HOME}/.iterm2_shell_integration.zsh"
-	[ -f /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ] && source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-	[ -f /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh ] && source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
 	[ -f /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh ] && source /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh
+	# [ -f /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ] && source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+	# [ -f /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh ] && source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
 	# [ -f /opt/homebrew/share/liquidprompt ] && source /opt/homebrew/share/liquidprompt
 fi