diff --git a/.aliases b/.aliases
index 8eb2cda..ee3a2b8 100644
--- a/.aliases
+++ b/.aliases
@@ -58,3 +58,4 @@ sumgnt() {
 }
 
 alias shmgnt="sshpass -p ekitool ssh"
+alias sutom="cat ~/mots.txt | sed 's/[éèëê]/e/g' | sed 's/[àâä]/a/g' | sed 's/[ïî]/i/g'"
diff --git a/.termrc b/.termrc
index 00b21f4..4c1a43b 100644
--- a/.termrc
+++ b/.termrc
@@ -22,6 +22,14 @@ function chkinst {
 	command -v $1 &>/dev/null
 }
 
+# Enable SSH keyring when kwallet is unavailable
+if chkinst keychain && [ -n "$WSLENV"] || [ -n "$SSH_CLIENT" ] || [ -n "$SSH2_CLIENT" ]; then
+	# Load SSH keychain
+	keychain -q --nogui ~/.ssh/id_rsa
+	source ~/.keychain/${HOST}-sh
+	#source ~/.keychain/${HOST}-sh-gpg
+fi
+
 # Add Rust crates to path
 chkinst rust && export PATH=$PATH:$HOME/.cargo/bin
 
@@ -72,10 +80,6 @@ echo -e '\e[34m [termrc] Config reloaded\e[0m'
 if [ -n "$WSLENV" ] ; then
 	printf '\e[34m [termrc] Running on WSL\e[0m\n'
 	
-	# Load SSH keychain
-	/usr/bin/keychain -q --nogui $HOME/.ssh/id_rsa
-	source "$HOME/.keychain/$HOST-sh"
-	
 	# Enable entr workaround for incomplete inotify support on WSL
 	export ENTR_INOTIFY_WORKAROUND=1
 	
diff --git a/.zshrc b/.zshrc
index fad999a..2c9d3fd 100644
--- a/.zshrc
+++ b/.zshrc
@@ -69,6 +69,6 @@ bindkey -e
 # Disable zsh globbing error messages, leave it to the called program
 setopt +o nomatch
 
-# Set immediate completion
+# Enable immediate completion (also remove '_list' from zstyle completion section above)
 setopt menu_complete