diff --git a/dot_config/topgrade.toml.tmpl b/dot_config/topgrade.toml.tmpl
index 1098f6a..7a5d46c 100644
--- a/dot_config/topgrade.toml.tmpl
+++ b/dot_config/topgrade.toml.tmpl
@@ -3,7 +3,7 @@
 #assume_yes = true
 
 # Disable specific steps - same options as the command line flag
-disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell",  "snap", "firmware", "clam_av_db"]
+disable = ["tldr", "pip3", "node", "vim", "git_repos", "containers", "asdf", "distrobox", "helix", "composer", "yarn", "cargo", "remotes", "rustup", "vscode", "powershell", "dotnet", "flatpak", "shell",  "snap", "firmware", "sheldon", "clam_av_db"]
 
 # Skip Notify
 skip_notify = true
diff --git a/dot_config/zsh/dot_zshenv.tmpl b/dot_config/zsh/dot_zshenv.tmpl
index c409fc4..ce579b8 100644
--- a/dot_config/zsh/dot_zshenv.tmpl
+++ b/dot_config/zsh/dot_zshenv.tmpl
@@ -60,8 +60,8 @@ export HISTSIZE=$(( 1.2 * SAVEHIST ))
 export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh
 export HISTFILE="$ZSH_CACHE_DIR"/history
 export GPG_TTY="$TTY"
-{{ if eq .chezmoi.osRelease.id "endeavouros" }}
+{{- if eq .chezmoi.osRelease.id "endeavouros" }}
 export DIFFPROG='meld'
-{{ end }}
+{{- end }}
 export AUTO_NTFY_DONE_IGNORE="ntfy emacs htop info less mail man meld most mutt nano screen ssh tail tmux top vi vim watch bat cat kate topgrade"
 export EXA_COLORS="uu=36:gu=37:sn=32:sb=32:da=34:ur=34:uw=35:ux=36:ue=36:gr=34:gw=35:gx=36:tr=34:tw=35:tx=36"
diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl
index a577fb1..c92092d 100644
--- a/dot_config/zsh/dot_zshrc.tmpl
+++ b/dot_config/zsh/dot_zshrc.tmpl
@@ -2,12 +2,14 @@ test -v DISTROBOX_HOST_HOME && { unset ZDOTDIR; exec zsh } # fix distrobox
 test "x$TERMINALNAME" = "xalacritty" && eval "$(zellij setup --generate-auto-start zsh)" # autostart zellij only in alacritty
 
 # options
-setopt NO_CLOBBER INTERACTIVE_COMMENTS HASH_EXECUTABLES_ONLY NUMERIC_GLOB_SORT
+setopt NO_CLOBBER
 unsetopt FLOW_CONTROL
 
 # deduplicate path
 typeset -U path PATH
+{{- if eq .chezmoi.osRelease.id "endeavouros" }}
 path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox
+{{- end }}
 path+=("$HOME"/.local/bin) # local bin
 
 # startup banner
@@ -32,8 +34,6 @@ _evalcache direnv hook zsh
 
 # source files
 source "$ZDOTDIR"/files/aliases.zsh
-
-# completion files
 source "$ZDOTDIR"/files/sshcomp.zsh
 
 # local overrides