diff --git a/.conduit.yaml b/.conduit.yaml
index 806089f..c4eedf7 100644
--- a/.conduit.yaml
+++ b/.conduit.yaml
@@ -19,7 +19,7 @@
 - repo:
     - https://github.com/zsh-users/zsh-autosuggestions.git
     - https://github.com/zsh-users/zsh-history-substring-search.git
-    - https://github.com/zsh-users/zsh-syntax-highlighting.git
+    - https://github.com/zdharma/fast-syntax-highlighting.git
 - pip:
     - --user pick
 - message: zsh will be the default prompt after next login
diff --git a/zshrc b/zshrc
index 1399434..f4545cd 100644
--- a/zshrc
+++ b/zshrc
@@ -9,10 +9,22 @@ source-plugin() {
     echo "zsh plugin not found: $1"
   fi
 }
+
+# Fish like automatic suggestions from command history
 source-plugin zsh-autosuggestions
+# Disable non end-of-line autosuggest accept widgets
+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(end-of-line vi-end-of-line)
+
+# Search history with a command substring
 source-plugin zsh-history-substring-search
-source-plugin zsh-syntax-highlighting
+
+# Command syntax highlighting
+source-plugin fast-syntax-highlighting
+
+# Automatically source .enter and .exit scripts on cd
 source-plugin autoenv
+
+# Build system helper commands
 source-plugin build
 
 # Disable non end-of-line autosuggest accept widgets