diff --git a/.zshrc b/.zshrc
index a857711..69d5722 100644
--- a/.zshrc
+++ b/.zshrc
@@ -25,14 +25,15 @@ bindkey "^H" vi-backward-kill-word #C-Backspace
 bindkey "^[[3;5~" delete-word #C-Delete
 # End of lines configured by zsh-newuser-install
 
-
+source /usr/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh
+bindkey -M menuselect '\r' .accept-line
 # The following lines were added by compinstall
 zstyle ':completion:*' menu select
 zstyle ':completion::complete:*' gain-privileges 1
 zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'l:|=* r:|=*' 'r:|[._-]=* r:|=*'
 
-autoload -Uz compinit
-compinit
+#autoload -Uz compinit
+#compinit
 # End of lines added by compinstall
 
 
@@ -70,6 +71,8 @@ prompt fire
 export GOBIN=/usr/local/bin
 export PATH=$HOME/.yarn/bin:$HOME/.local/bin:$PATH
 
+eval "$(zoxide init --cmd cd zsh)"
+
 export MANPAGER="sh -c 'col -bx|batcat -l man -p'"
 alias cat="batcat -pp"
 alias h="batcat -pl help"
diff --git a/init.sh b/init.sh
index eff233c..ace8a54 100755
--- a/init.sh
+++ b/init.sh
@@ -113,6 +113,9 @@ deb $SEC_URL $OS_CODE-security main contrib non-free non-free-firmware
     fi
     cp "$SCRIPTPATH/TINK-CA.crt" /usr/local/share/ca-certificates
     update-ca-certificates
+
+    git -C /usr/share clone --depth 1 https://git.tink.ltd:8443/tink/zsh-autocomplete.git
+    ./update-github-release.sh -p /usr/local/bin -n zoxide -r ajeetdsouza/zoxide -m x86_64-unknown -v -V
 }
 
 install_pkg(){