diff --git a/.gitmodules b/.gitmodules
index 676771b..3985068 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "tmux/themes"]
 	path = tmux/themes
 	url = git@github.com:jimeh/tmux-themepack.git
-[submodule "shell/enhancd"]
-	path = shell/enhancd
-	url = https://github.com/b4b4r07/enhancd
 [submodule "shell/zsh/zplug"]
 	path = shell/zsh/zplug
 	url = https://github.com/b4b4r07/zplug
diff --git a/shell/_main.sh b/shell/_main.sh
index c63f355..3d4a183 100644
--- a/shell/_main.sh
+++ b/shell/_main.sh
@@ -28,7 +28,6 @@ source "$DOTSHELL/aliases.sh"
 source "$DOTSHELL/emacs.sh"
 source "$DOTSHELL/git.sh"
 source "$DOTSHELL/tmux.sh"
-source "$DOTSHELL/enhancd.sh"
 
 # Development
 source "$DOTSHELL/nodejs.sh"
diff --git a/shell/enhancd b/shell/enhancd
deleted file mode 160000
index 8654292..0000000
--- a/shell/enhancd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 865429281da8815ac2aefb7c39de469143f20b5d
diff --git a/shell/enhancd.sh b/shell/enhancd.sh
deleted file mode 100644
index 5584a90..0000000
--- a/shell/enhancd.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export ENHANCD_COMMAND=c
-export ENHANCD_FILTER="peco --layout=bottom-up"
-source "$DOTSHELL/enhancd/enhancd.sh"
diff --git a/shell/zshrc.zsh b/shell/zshrc.zsh
index fde285f..0bdce96 100644
--- a/shell/zshrc.zsh
+++ b/shell/zshrc.zsh
@@ -25,10 +25,6 @@ unsetopt correctall
 # Cause I hit emacs shorts too much.
 bindkey -s "\C-x\C-f" "cd "
 
-# use ctrl+t to toggle autosuggestions(hopefully this wont be needed as
-# zsh-autosuggestions is designed to be unobtrusive).
-bindkey '^T' autosuggest-toggle
-
 #
 # zplug
 #
@@ -43,7 +39,10 @@ zplug "plugins/powder", from:oh-my-zsh
 
 zplug "$DOTZSH/themes/plain", from:local
 
+# zplug "junegunn/fzf", of:"shell/*.zsh"
 zplug "jimeh/zsh-peco-history"
+
+zplug "b4b4r07/enhancd", of:"zsh/*.zsh"
 zplug "zsh-users/zsh-completions"
 zplug "zsh-users/zsh-autosuggestions"
 zplug "zsh-users/zsh-syntax-highlighting", nice:19
@@ -57,9 +56,14 @@ if ! zplug check --verbose; then
   fi
 fi
 
-zplug load
+if zplug check "b4b4r07/enhancd"; then
+  export ENHANCD_COMMAND=c
+  export ENHANCD_FILTER="fzf:peco --layout=bottom-up"
+fi
 
 # Configure zsh-syntax-highlighting
 if zplug check zsh-users/zsh-syntax-highlighting; then
   export ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 fi
+
+zplug load