diff --git a/zsh/conf.d/n97 b/zsh/conf.d/n97
index 2025b36..ba77da3 100755
--- a/zsh/conf.d/n97
+++ b/zsh/conf.d/n97
@@ -9,7 +9,7 @@
 # author:	Daniel Sommer <daniel.sommer@velvettear.de>
 # license:	MIT
 
-# ----- aliases ----- #
+# ----- general aliases ----- #
 alias eza='eza --icons --group --time-style long-iso --octal-permissions --git'
 alias ls='eza'
 alias ll='eza --long'
@@ -35,7 +35,11 @@ alias pfetch='printf "\n" && pfetch'
 alias fetch='pfetch'
 alias stats='pfetch'
 alias icat='kitten icat'
-alias ssh='kitty +kitten ssh'
+
+# ----- non-ssh aliases ----- #
+if [[ -n "$SSH_TTY" ]]; then
+	alias ssh='kitty +kitten ssh'
+fi
 
 # ----- pfetch ----- #
 export PF_INFO="ascii title host kernel memory wm shell editor pkgs uptime palette"
diff --git a/zsh/zprofile b/zsh/zprofile
index f0bc81b..ab0cca2 100755
--- a/zsh/zprofile
+++ b/zsh/zprofile
@@ -23,7 +23,7 @@ export TEMP="/tmp"
 export TMPDIR="/tmp"
 export EDITOR="nvim"
 export VISUAL="nvim"
-if [[ "$(command bat 2> /dev/null)" ]]; then
+if [[ "$(which bat 2> /dev/null)" ]]; then
 	export PAGER="bat"
 else
 	export PAGER="less"