diff --git a/zsh/config b/zsh/config
index fe03dfe1..83fadb5c 100644
--- a/zsh/config
+++ b/zsh/config
@@ -4,7 +4,7 @@
 # unsetopt correct_all
 
 # Don't wait for keys (snappier vi-mode)
-export KEYTIMEOUT=1
+# export KEYTIMEOUT=1
 
 zle -N edit-command-line
 bindkey -v
@@ -13,3 +13,13 @@ bindkey '^f' edit-command-line
 bindkey -M viins '^w' backward-kill-word
 bindkey -M viins '^a' beginning-of-line
 bindkey -M viins '^e' end-of-line
+
+bindkey -M viins ' ' magic-space
+bindkey -M viins 'jj' vi-cmd-mode
+
+
+bindkey -M vicmd "q" push-line
+
+# Incremental search is elite!
+bindkey -M vicmd "/" history-incremental-search-backward
+bindkey -M vicmd "?" history-incremental-search-forward
diff --git a/zsh/preztorc b/zsh/preztorc
index ddede30a..19294a68 100644
--- a/zsh/preztorc
+++ b/zsh/preztorc
@@ -31,6 +31,7 @@ zstyle ':prezto:load' pmodule \
     'completion' \
     'prompt' \
     'git' \
+    'syntax-highlighting' \
     'osx'
 
 
@@ -77,12 +78,12 @@ zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github'
 
 # Set syntax highlighters.
 # By default, only the main highlighter is enabled.
-# zstyle ':prezto:module:syntax-highlighting' highlighters \
-#   'main' \
-#   'brackets' \
-#   'pattern' \
-#   'cursor' \
-#   'root'
+zstyle ':prezto:module:syntax-highlighting' highlighters \
+  'main' \
+  'brackets' \
+  'pattern' \
+  'cursor' \
+  'root'
 #
 # Set syntax highlighting styles.
 # zstyle ':prezto:module:syntax-highlighting' styles \
@@ -109,4 +110,4 @@ zstyle ':prezto:module:terminal' auto-title 'yes'
 # zstyle ':prezto:module:tmux:auto-start' local 'yes'
 
 # Auto start a session when Zsh is launched in a SSH connection.
-# zstyle ':prezto:module:tmux:auto-start' remote 'yes'
\ No newline at end of file
+# zstyle ':prezto:module:tmux:auto-start' remote 'yes'
diff --git a/zshrc b/zshrc
index 23d1cea2..6dd75b00 100644
--- a/zshrc
+++ b/zshrc
@@ -7,7 +7,6 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
 fi
 
 # Source component rcfiles
-source ~/.zsh/functions
 source ~/.zsh/aliases
 source ~/.zsh/config