diff --git a/.gitmodules b/.gitmodules
index 5090887..7ce6edd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "oh-my-zsh"]
 	path = oh-my-zsh
-	url = https://github.com/robbyrussell/oh-my-zsh.git
+	url = https://git.st8l.com/dolysis/ohmyzsh.git
 [submodule "zsh-custom/plugins/zsh-autosuggestions"]
 	path = zsh-custom/plugins/zsh-autosuggestions
 	url = https://github.com/zsh-users/zsh-autosuggestions
@@ -25,3 +25,6 @@
 [submodule "tmux/plugins/tpm"]
 	path = tmux/plugins/tpm
 	url = https://github.com/tmux-plugins/tpm
+[submodule "zsh-custom/plugins/zsh-vi-mode"]
+	path = zsh-custom/plugins/zsh-vi-mode
+	url = https://github.com/jeffreytse/zsh-vi-mode
diff --git a/oh-my-zsh b/oh-my-zsh
index 7dcabbe..c8e600f 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 7dcabbe6826073ef6069c8a4b6f9a943f00d2df0
+Subproject commit c8e600f39779c6d2ef75b40304b5391a541c41df
diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm
index 693e5a2..99469c4 160000
--- a/tmux/plugins/tpm
+++ b/tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b
+Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946
diff --git a/zsh-custom/lxd-completion-zsh b/zsh-custom/lxd-completion-zsh
index e82701c..46ae7ac 160000
--- a/zsh-custom/lxd-completion-zsh
+++ b/zsh-custom/lxd-completion-zsh
@@ -1 +1 @@
-Subproject commit e82701cb2b8c42f63479bb1a34e4f78a7cb5b75c
+Subproject commit 46ae7ac8e35a52d2e2a8aed032d499cfcea49276
diff --git a/zsh-custom/plugins/zsh-autosuggestions b/zsh-custom/plugins/zsh-autosuggestions
index a411ef3..c3d4e57 160000
--- a/zsh-custom/plugins/zsh-autosuggestions
+++ b/zsh-custom/plugins/zsh-autosuggestions
@@ -1 +1 @@
-Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8
+Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
diff --git a/zsh-custom/plugins/zsh-completions b/zsh-custom/plugins/zsh-completions
index acd4de5..634736c 160000
--- a/zsh-custom/plugins/zsh-completions
+++ b/zsh-custom/plugins/zsh-completions
@@ -1 +1 @@
-Subproject commit acd4de5268ee23ffa3ec1f6f13a2ec91266e1564
+Subproject commit 634736c009a8c982b798b2edee93a0dfc6ef1a54
diff --git a/zsh-custom/plugins/zsh-history-substring-search b/zsh-custom/plugins/zsh-history-substring-search
index 4abed97..19b8876 160000
--- a/zsh-custom/plugins/zsh-history-substring-search
+++ b/zsh-custom/plugins/zsh-history-substring-search
@@ -1 +1 @@
-Subproject commit 4abed97b6e67eb5590b39bcd59080aa23192f25d
+Subproject commit 19b887667a155befeb5850f0af46a45cc5311ae2
diff --git a/zsh-custom/plugins/zsh-syntax-highlighting b/zsh-custom/plugins/zsh-syntax-highlighting
index caa749d..bb27265 160000
--- a/zsh-custom/plugins/zsh-syntax-highlighting
+++ b/zsh-custom/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit caa749d030d22168445c4cb97befd406d2828db0
+Subproject commit bb27265aeeb0a22fb77f1275118a5edba260ec47
diff --git a/zsh-custom/plugins/zsh-vi-mode b/zsh-custom/plugins/zsh-vi-mode
new file mode 160000
index 0000000..ea1f58a
--- /dev/null
+++ b/zsh-custom/plugins/zsh-vi-mode
@@ -0,0 +1 @@
+Subproject commit ea1f58ab9b1f3eac50e2cde3e3bc612049ef683b