diff --git a/.conduit.yaml b/.conduit.yaml
index 39a5a95..5e461e7 100644
--- a/.conduit.yaml
+++ b/.conduit.yaml
@@ -28,7 +28,7 @@
 - repo:
     - https://github.com/zsh-users/zsh-autosuggestions.git
     - https://github.com/zsh-users/zsh-history-substring-search.git
-    - https://github.com/zdharma/fast-syntax-highlighting.git
+    - https://github.com/zsh-users/zsh-syntax-highlighting.git
     - https://github.com/junegunn/fzf.git
 - command:
     - fzf/install --bin
diff --git a/README.md b/README.md
index 132b803..aa1cc25 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,7 @@ Plugins are sourced manually and their git repositories tracked by
 [conduit][conduit], no plugin manager is used.
 
 * [zsh-autosuggestions][zsh-autosuggestions] Fish-like autosuggestions for zsh.
-* [fast-syntax-highlighting][syntax] Optimized and extended
-  zsh-syntax-highlighting - Fish shell like syntax highlighting for Zsh.
+* [zsh-syntax-highlighting][syntax] Fish shell like syntax highlighting for Zsh.
 * [zsh-history-substring-search][search] Zsh port of the Fish shell's history
   search.
 
@@ -153,7 +152,7 @@ Various aliases are defined at the end of [zshrc](zshrc) for convenience.
 [git-prompt]: https://github.com/olivierverdier/zsh-git-prompt
 [zsh-autosuggestions]: https://github.com/zdharma/fast-syntax-highlighting
 [zsh-autoenv]: https://github.com/Tarrasch/zsh-autoenv
-[syntax]: https://github.com/zdharma/fast-syntax-highlighting
+[syntax]: https://github.com/zsh-users/zsh-syntax-highlighting
 [search]: https://github.com/zsh-users/zsh-history-substring-search
 [vim-mode]: https://github.com/sharat87/zsh-vim-mode
 [tmux]: https://tmux.github.io
diff --git a/zshrc b/zshrc
index dca4bbf..f66ea16 100644
--- a/zshrc
+++ b/zshrc
@@ -19,8 +19,7 @@ ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(end-of-line vi-end-of-line)
 source-plugin zsh-history-substring-search
 
 # Command syntax highlighting
-source-plugin fast-syntax-highlighting
-fast-theme -q ~/.config/zsh/fresh.ini
+source-plugin zsh-syntax-highlighting
 
 # Automatically source .enter and .exit scripts on cd
 source-plugin autoenv