diff --git a/.zshrc b/.zshrc
index 7870d45..bf957f0 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,12 +5,13 @@ for S in \
 	05-start \
 	15-options \
 	25-history \
-	41-zinit \
+	42-zinit \
 	45-plugins \
 	55-agents \
 	65-scripts \
 	75-aliases \
-	85-completion \
+	82-completion \
+	85-keybindings \
 	88-prompt \
 	95-finish
 do
diff --git a/41-zinit.zsh b/42-zinit.zsh
similarity index 100%
rename from 41-zinit.zsh
rename to 42-zinit.zsh
diff --git a/45-plugins.zsh b/45-plugins.zsh
index c874735..e3fee5f 100644
--- a/45-plugins.zsh
+++ b/45-plugins.zsh
@@ -33,7 +33,6 @@ zinit light joshskidmore/zsh-fzf-history-search
 if command -v git > /dev/null 2>&1; then
 	GIT_AUTO_FETCH_INTERVAL=3600
 	zinit snippet OMZP::git
-	zinit snippet OMZP::gitfast
 	zinit snippet OMZP::git-extras
 	zinit snippet OMZP::github
 	[ -z ${SSH_CONNECTION+set} ] && zinit snippet OMZP::git-auto-fetch
diff --git a/85-completion.zsh b/82-completion.zsh
similarity index 75%
rename from 85-completion.zsh
rename to 82-completion.zsh
index 61db4aa..75bbdd3 100644
--- a/85-completion.zsh
+++ b/82-completion.zsh
@@ -23,15 +23,18 @@ zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host'   ignored-patterns '*.*' loo
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^*.*' '*@*'
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^<->.<->.<->.<->' '127.0.0.<->'
 
-if is-at-least 5.7; then
-	zstyle ':autocomplete:*' min-input 2
-	zstyle ':autocomplete:*' fzf-completion yes
-	zinit light marlonrichert/zsh-autocomplete
-else
-	zinit wait lucid light-mode for \
-		atinit"zicompinit; zicdreplay" zdharma-continuum/fast-syntax-highlighting \
-		atload"_zsh_autosuggest_start" zsh-users/zsh-autosuggestions \
-		blockf atpull'zinit creinstall -q .' zsh-users/zsh-completions
-	zinit load zsh-users/zsh-history-substring-search
-fi
+# marlonrichert/zsh-autocomplete
+
+zinit wait lucid for \
+	atinit"ZINIT[COMPINIT_OPTS]=-C; zicompinit; zicdreplay" \
+	  zdharma-continuum/fast-syntax-highlighting \
+	blockf \
+	  zsh-users/zsh-completions \
+	atload"!_zsh_autosuggest_start" \
+	  zsh-users/zsh-autosuggestions
+
+zstyle ":history-search-multi-word" page-size "$(($LINES/2))"
+zstyle ":plugin:history-search-multi-word" clear-on-cancel "yes"
+zinit load zdharma-continuum/history-search-multi-word
+bindkey "^K" history-search-multi-word
 
diff --git a/85-keybindings.zsh b/85-keybindings.zsh
new file mode 100644
index 0000000..70ec07b
--- /dev/null
+++ b/85-keybindings.zsh
@@ -0,0 +1,5 @@
+# Defined shortcut keys: [Esc] [Esc]
+bindkey -M emacs '\e\e' send-break
+bindkey -M vicmd '\e\e' send-break
+bindkey -M viins '\e\e' send-break
+