diff --git a/.gitmodules b/.gitmodules
index 0b022f2..406da39 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "files/.vim/bundle/repos/github.com/Shougo/dein.vim"]
 	path = files/.vim/bundle/repos/github.com/Shougo/dein.vim
 	url = https://github.com/Shougo/dein.vim.git
+[submodule "files/.config/zsh/custom/plugins/history-search-multi-word"]
+	path = files/.config/zsh/custom/plugins/history-search-multi-word
+	url = https://github.com/zdharma/history-search-multi-word.git
diff --git a/files/.config/zsh/custom/300-syntax-highlighting.zsh b/files/.config/zsh/custom/300-syntax-highlighting.zsh
index 6c4081f..c664a68 100644
--- a/files/.config/zsh/custom/300-syntax-highlighting.zsh
+++ b/files/.config/zsh/custom/300-syntax-highlighting.zsh
@@ -1,27 +1,26 @@
-#ZSH_HIGHLIGHT_STYLES[default]="none"
-#ZSH_HIGHLIGHT_STYLES[unknown-token]="fg=red,bold"
-#ZSH_HIGHLIGHT_STYLES[reserved-word]="fg=magenta"
-ZSH_HIGHLIGHT_STYLES[alias]="none"
-ZSH_HIGHLIGHT_STYLES[builtin]="magenta,bold"
-ZSH_HIGHLIGHT_STYLES[function]="none"
-ZSH_HIGHLIGHT_STYLES[command]="none"
-ZSH_HIGHLIGHT_STYLES[precommand]="none"
+ZSH_HIGHLIGHT_STYLES[default]="none"
+ZSH_HIGHLIGHT_STYLES[unknown-token]="fg=red,bold"
+ZSH_HIGHLIGHT_STYLES[reserved-word]="fg=yellow"
+ZSH_HIGHLIGHT_STYLES[alias]="fg=white,bold"
+ZSH_HIGHLIGHT_STYLES[builtin]="fg=magenta,bold"
+ZSH_HIGHLIGHT_STYLES[function]="fg=white,bold"
+ZSH_HIGHLIGHT_STYLES[command]="fg=white,bold"
+ZSH_HIGHLIGHT_STYLES[precommand]="fg=yellow,bold"
 ZSH_HIGHLIGHT_STYLES[commandseparator]="none"
 ZSH_HIGHLIGHT_STYLES[hashed-command]="none"
-ZSH_HIGHLIGHT_STYLES[path]="fg=white,bold"
-ZSH_HIGHLIGHT_STYLES[globbing]="fg=white,bold"
-#ZSH_HIGHLIGHT_STYLES[history-expansion]="fg=blue"
+ZSH_HIGHLIGHT_STYLES[path]="none"
+ZSH_HIGHLIGHT_STYLES[globbing]="none"
+ZSH_HIGHLIGHT_STYLES[history-expansion]="fg=blue"
 ZSH_HIGHLIGHT_STYLES[single-hyphen-option]="fg=cyan"
 ZSH_HIGHLIGHT_STYLES[double-hyphen-option]="fg=cyan,bold"
-#ZSH_HIGHLIGHT_STYLES[back-quoted-argument]="none"
 ZSH_HIGHLIGHT_STYLES[single-quoted-argument]="fg=green"
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]="fg=red,bold"
 ZSH_HIGHLIGHT_STYLES[double-quoted-argument]="fg=green"
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]="fg=red,bold"
 ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]="fg=yellow"
 ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]="fg=yellow"
 #ZSH_HIGHLIGHT_STYLES[assign]="none"
 
-#ZSH_HIGHLIGHT_STYLES[bracket-level-1]="fg=cyan,bold"
-#ZSH_HIGHLIGHT_STYLES[bracket-level-2]="fg=blue,bold"
-#ZSH_HIGHLIGHT_STYLES[bracket-level-3]="fg=yellow,bold"
-#ZSH_HIGHLIGHT_STYLES[bracket-level-4]="fg=magenta,bold"
+HSMW_HIGHLIGHT_STYLES=("${(@kvf)ZSH_HIGHLIGHT_STYLES}")
+FAST_HIGHLIGHT_STYLES=("${(@kvf)ZSH_HIGHLIGHT_STYLES}")
 
diff --git a/files/.config/zsh/custom/plugins/fast-syntax-highlighting b/files/.config/zsh/custom/plugins/fast-syntax-highlighting
new file mode 160000
index 0000000..c087169
--- /dev/null
+++ b/files/.config/zsh/custom/plugins/fast-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit c087169e66b38d989d068d00e49ce09a897af8dd
diff --git a/files/.config/zsh/custom/plugins/history-search-multi-word b/files/.config/zsh/custom/plugins/history-search-multi-word
new file mode 160000
index 0000000..2a59378
--- /dev/null
+++ b/files/.config/zsh/custom/plugins/history-search-multi-word
@@ -0,0 +1 @@
+Subproject commit 2a593787b2645c941c6aabfabca7dfd00721d56b
diff --git a/files/.config/zsh/custom/plugins/zsh-syntax-highlighting b/files/.config/zsh/custom/plugins/zsh-syntax-highlighting
index 2c0c75a..e4fffa4 160000
--- a/files/.config/zsh/custom/plugins/zsh-syntax-highlighting
+++ b/files/.config/zsh/custom/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit 2c0c75a8ee9a0f212eebbe4ee91ca5884f18e52f
+Subproject commit e4fffa4de566c9552f9284fd75e689edb3a1083d
diff --git a/files/.config/zsh/oh-my-zsh b/files/.config/zsh/oh-my-zsh
index 7ed82b4..0cec462 160000
--- a/files/.config/zsh/oh-my-zsh
+++ b/files/.config/zsh/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 7ed82b4df6d381ef26a4dbdf253bf414497adcd1
+Subproject commit 0cec4626219bfd5a163986ebe3745fc31b593446
diff --git a/files/.vim/bundle/repos/github.com/Shougo/dein.vim b/files/.vim/bundle/repos/github.com/Shougo/dein.vim
index 5bbff63..ec5a35c 160000
--- a/files/.vim/bundle/repos/github.com/Shougo/dein.vim
+++ b/files/.vim/bundle/repos/github.com/Shougo/dein.vim
@@ -1 +1 @@
-Subproject commit 5bbff63c09126580ed1ef0df8ed2496d4c0fee82
+Subproject commit ec5a35ce0b4dc954d278a1bb29d96ef118e96a29
diff --git a/files/.zshrc b/files/.zshrc
index f68af07..38f3263 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -23,7 +23,7 @@ ZSH_THEME="noglyph"
 # HYPHEN_INSENSITIVE="true"
 
 # Uncomment the following line to disable bi-weekly auto-update checks.
-# DISABLE_AUTO_UPDATE="true"
+DISABLE_AUTO_UPDATE="true"
 
 # Uncomment the following line to change how often to auto-update (in days).
 # export UPDATE_ZSH_DAYS=13
@@ -57,7 +57,7 @@ ZSH_CUSTOM="$HOME/.config/zsh/custom/"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git archlinux tmux thefuck zsh-syntax-highlighting zsh-autosuggestions)
+plugins=(git archlinux tmux thefuck zsh-autosuggestions history-search-multi-word zsh-syntax-highlighting)
 
 source $ZSH/oh-my-zsh.sh