diff --git a/custom/aliases.zsh b/custom/aliases.zsh
index 02e510848..4a77c9faf 100644
--- a/custom/aliases.zsh
+++ b/custom/aliases.zsh
@@ -35,7 +35,7 @@ TRAPHUP() {
   source $ohmyzsh/custom/aliases.zsh
 }
 
-alias ae='vim $oh-my-zsh/custom/aliases.zsh'      #alias edit
+alias ae='vi $ohmyzsh/custom/aliases.zsh'      #alias edit
 alias arl='source $oh-my-zsh/custom/aliases.zsh'  #alias reload
 alias gar="killall -HUP -u \"$USER\" zsh"         #global alias reload
 
@@ -56,6 +56,3 @@ alias :q='exit'
 
 # vimrc editing
 alias ve='vi ~/.vimrc'
-
-# map fasd to autojump
-alias 'z=j'
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 644b856f2..ed28cffa4 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -75,6 +75,19 @@ plugins=(
     alias-finder
     aliases
     autojump
+    command-not-found
+    common-aliases
+    compleat
+    copybuffer
+    copyfile
+    copypath
+    dirhistory
+    docker
+    extract
+    fd
+    jfrog
+    man
+    vscode
 )
 
 source $ZSH/oh-my-zsh.sh
@@ -104,4 +117,6 @@ source $ZSH/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
- [ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh
+
+[ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh
+ZSH_ALIAS_FINDER_AUTOMATIC=true