diff --git a/.gitmodules b/.gitmodules
index 8a772e7..39c5717 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,12 @@
 [submodule "root/usr/local/src/dmenu"]
     path = "root/usr/local/src/dmenu"
     url = "https://github.com/ItsDrike/dmenu"
+[submodule "root/usr/share/zsh/site-functions/zsh-autosuggestions"]
+    path = "root/usr/share/zsh/site-functions/zsh-autosuggestions"
+    url = "https://github.com/zsh-users/zsh-autosuggestions"
+[submodule "root/usr/share/zsh/site-functions/zsh-syntax-highlighting"]
+    path = "root/usr/share/zsh/site-functions/zsh-syntax-highlighting"
+    url = "https://github.com/zsh-users/zsh-syntax-highlighting"
+[submodule "home/.local/src/z.lua"]
+    path = "home/.local/src/z.lua"
+    url = "https://github.com/skywind3000/z.lua"
diff --git a/home/.config/zsh/.zshrc b/home/.config/zsh/.zshrc
index ba241a9..cd66b0d 100755
--- a/home/.config/zsh/.zshrc
+++ b/home/.config/zsh/.zshrc
@@ -62,6 +62,7 @@ zstyle ':completion:::::' completer _expand _complete _ignored _approximate #ena
 
 # Load extensions (should be last)
 . /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh 2>/dev/null	                    # Syntax highlighting
-. /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null			# Auto suggestions
 . /usr/share/autojump/autojump.zsh 2>/dev/null												# Auto-Jump
+. /usr/share/zsh/site-functions/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null			# Auto suggestions
+eval "$(lua ~/.local/src/z.lua/z.lua --init zsh enhanced)"                                        # Auto-Jump alternative
 
diff --git a/home/.local/src/z.lua b/home/.local/src/z.lua
new file mode 160000
index 0000000..a3d4f5d
--- /dev/null
+++ b/home/.local/src/z.lua
@@ -0,0 +1 @@
+Subproject commit a3d4f5db684ed6dfd3041e73d1d761f5fe944179
diff --git a/root/usr/share/zsh/site-functions/zsh-autosuggestions b/root/usr/share/zsh/site-functions/zsh-autosuggestions
new file mode 160000
index 0000000..a411ef3
--- /dev/null
+++ b/root/usr/share/zsh/site-functions/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8
diff --git a/root/usr/share/zsh/site-functions/zsh-syntax-highlighting b/root/usr/share/zsh/site-functions/zsh-syntax-highlighting
new file mode 160000
index 0000000..dffe304
--- /dev/null
+++ b/root/usr/share/zsh/site-functions/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit dffe304567c86f06bf1be0fce200077504e79783
diff --git a/root/usr/src/dmenu b/root/usr/src/dmenu
new file mode 160000
index 0000000..8e6bb7b
--- /dev/null
+++ b/root/usr/src/dmenu
@@ -0,0 +1 @@
+Subproject commit 8e6bb7b92f421489aef49d98985bb8aaf0ddc0ce