diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 3141817..9b5f8ec 100755
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -4,9 +4,10 @@ pfetch
 
 eval "$(starship init zsh)"
 
-[ -f "$HOME/.local/share/zap/zap.zsh" ] && source "$HOME/.local/share/zap/zap.zsh"
+# Startup zoxide
+eval "$(zoxide init zsh)"
 
-zstyle ':completion:*' rehash true
+[ -f "$HOME/.local/share/zap/zap.zsh" ] && source "$HOME/.local/share/zap/zap.zsh"
 
 # Plugins
 plug "kutsan/zsh-system-clipboard"
@@ -17,12 +18,14 @@ plug "zap-zsh/vim"
 plug "zsh-users/zsh-autosuggestions"
 plug "zsh-users/zsh-completions"
 plug "chivalryq/git-alias"
+plug "zap-zsh/fzf"
+plug "zap-zsh/magic-enter"
 plug "zdharma-continuum/fast-syntax-highlighting"
 plug "zsh-users/zsh-history-substring-search"
 plug "MichaelAquilina/zsh-you-should-use"
 
-# Startup zoxide
-eval "$(zoxide init zsh)"
+# VI Mode escape timeout fix
+export KEYTIMEOUT=1
 
 # Substring search settings
 export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="bg=blue,fg=black,bold"
@@ -30,7 +33,7 @@ export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=black,bold'
 bindkey -M vicmd 'k' history-substring-search-up
 bindkey -M vicmd 'j' history-substring-search-down
 
-# Plugin settings
+# Zsh System keyboard settings
 if [ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ]; then
     ZSH_SYSTEM_CLIPBOARD_METHOD="xsc"
 else
@@ -42,12 +45,12 @@ plug "$XDG_CONFIG_HOME/zsh/aliases.zsh"
 plug "$XDG_CONFIG_HOME/zsh/functions.zsh"
 
 # History settings
-setopt appendhistory
 setopt INC_APPEND_HISTORY
 export HISTTIMEFORMAT="[%F %T]"
 
 HISTFILE="$XDG_STATE_HOME"/zsh/history
 
+# Add nnn shell level to prompt
 [ -n "$NNNLVL" ] && PS1="N$NNNLVL $PS1"
 
 # cd on nnn quiting
@@ -64,3 +67,7 @@ trap nnn_cd EXIT
 if [ ! -z "$TMUX" ] && [ -d "./env" ]; then
     . ./env/bin/activate
 fi
+
+# Magic enter settings
+MAGIC_ENTER_GIT_COMMAND='gst -u'
+MAGIC_ENTER_OTHER_COMMAND='ls'