diff --git a/.gitmodules b/.gitmodules
index 6f1f6ea..417471d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "zsh-autosuggestions"]
 	path = zsh-autosuggestions
 	url = git://github.com/tarruda/zsh-autosuggestions
+[submodule "zsh-completions"]
+	path = zsh-completions
+	url = https://github.com/zsh-users/zsh-completions.git
diff --git a/my.zsh b/my.zsh
index 5585d8c..9ec068c 100644
--- a/my.zsh
+++ b/my.zsh
@@ -20,7 +20,6 @@
 current_path=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
 current_file=$current_path/$(basename -- "$0")
 
-source $current_path/lib/antigen.zsh
 
 #[[ -z "$PS1" ]] && return
 
@@ -63,3 +62,12 @@ theme=${THEME:-$myzsh/themes/lxsameer.zsh-theme}
 project_path=${PROJECTS:-~/src}
 
 cdpath=($project_path $cdpath)
+
+# Load syntax highlighter
+source $current_path/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+# Load autosuggestions
+source $current_path/zsh-autosuggestions/autosuggestions.zsh
+
+# Load ZAW
+source $current_path/zaw/zaw.zsh
diff --git a/zsh-completions b/zsh-completions
new file mode 160000
index 0000000..e029083
--- /dev/null
+++ b/zsh-completions
@@ -0,0 +1 @@
+Subproject commit e0290834aca5f15152d3d384547c7a0b62af4475