diff --git a/.gitmodules b/.gitmodules
index 1528e40..4ffd51b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "sh/ohmyzsh"]
 	path = sh/ohmyzsh
 	url = https://github.com/ohmyzsh/ohmyzsh
+[submodule "sh/ohmyzsh-custom/plugins/zsh-autosuggestions"]
+	path = sh/ohmyzsh-custom/plugins/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions
diff --git a/sh/.zshrc b/sh/.zshrc
index 80bdaa0..8020aae 100644
--- a/sh/.zshrc
+++ b/sh/.zshrc
@@ -1,6 +1,7 @@
 TOOLKIT=/etc/toolkit
 ZSH=$TOOLKIT/sh/ohmyzsh
 ZSH_THEME="bira"
+ZSH_CUSTOM=$TOOLKIT/sh/ohmyzsh-custom
 ZSH_CUSTOM_USER_SCRIPTS=$HOME/.zsh-scripts
 ZSH_CACHE_DIR=$HOME/.zsh-cache
 
@@ -11,7 +12,7 @@ ENABLE_CORRECTION="true"
 
 COMPLETION_WAITING_DOTS="true"
 
-plugins=(git)
+plugins=(git zsh-autosuggestions)
 
 zstyle ':omz:update' mode auto      # update automatically without asking
 zstyle ':omz:update' frequency 14
diff --git a/sh/custom_scripts/aliases.sh b/sh/custom-scripts/aliases.sh
similarity index 100%
rename from sh/custom_scripts/aliases.sh
rename to sh/custom-scripts/aliases.sh
diff --git a/sh/custom_scripts/os.sh b/sh/custom-scripts/os.sh
similarity index 100%
rename from sh/custom_scripts/os.sh
rename to sh/custom-scripts/os.sh
diff --git a/sh/custom_scripts/vars.sh b/sh/custom-scripts/vars.sh
similarity index 100%
rename from sh/custom_scripts/vars.sh
rename to sh/custom-scripts/vars.sh
diff --git a/sh/load.sh b/sh/load.sh
index b91237f..733649e 100755
--- a/sh/load.sh
+++ b/sh/load.sh
@@ -22,7 +22,7 @@ create_dir_if_not_exists() {
 }
 
 # Load custom scripts (aliases, variables, etc...)
-load_scripts_in_dir $TOOLKIT/sh/custom_scripts
+load_scripts_in_dir $TOOLKIT/sh/custom-scripts
 
 # Scripts ran to modify existing toolkit updates
-load_scripts_in_dir $TOOLKIT/sh/patch_scripts
+load_scripts_in_dir $TOOLKIT/sh/patch-scripts
diff --git a/sh/ohmyzsh-custom/plugins/zsh-autosuggestions b/sh/ohmyzsh-custom/plugins/zsh-autosuggestions
new file mode 160000
index 0000000..a411ef3
--- /dev/null
+++ b/sh/ohmyzsh-custom/plugins/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8