diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc
index b71deb8..5b714e3 100644
--- a/dot_config/zsh/dot_zshrc
+++ b/dot_config/zsh/dot_zshrc
@@ -84,7 +84,22 @@ if command -v keychain >/dev/null; then
   rbw unlock
   SSH_ASKPASS=get_id_rsa_pass SSH_ASKPASS_REQUIRE=force ssh-add ~/.ssh/id_rsa
 fi
-### End user configuration
+
+# Command not found handler
+if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
+    function command_not_found_handler {
+        if [ -x /usr/lib/command-not-found ]; then
+            /usr/lib/command-not-found -- "$1"
+            return $?
+        elif [ -x /usr/share/command-not-found/command-not-found ]; then
+            /usr/share/command-not-found/command-not-found -- "$1"
+            return $?
+        else
+            printf "zsh: command not found: %s\n" "$1" >&2
+            return 127
+        fi
+    }
+fi
 
 ### hooks/includes
 for plugin in zsh-syntax-highlighting zsh-history-substring-search \
@@ -93,6 +108,10 @@ for plugin in zsh-syntax-highlighting zsh-history-substring-search \
 		source /usr/share/zsh/plugins/$plugin/${plugin}.zsh
 	fi
 done
+source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source "$HOME/.local/share/zsh-history-substring-search/zsh-history-substring-search-1.1.0/zsh-history-substring-search.zsh"
+source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
 bindkey -M vicmd 'k' history-substring-search-up
@@ -101,3 +120,5 @@ bindkey -M vicmd 'j' history-substring-search-down
 if command -v pazi &>/dev/null; then
   eval "$(pazi init zsh)" # or 'bash'
 fi
+
+### End user configuration