diff --git a/.gitmodules b/.gitmodules
index 797b236..e68c9d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "nvim/pack/syntaxes/start/ale"]
 	path = nvim/pack/syntaxes/start/ale
 	url = https://github.com/dense-analysis/ale.git
-[submodule "nvim/pack/syntaxes/start/vim-polyglot"]
-	path = nvim/pack/syntaxes/start/vim-polyglot
-	url = https://github.com/sheerun/vim-polyglot.git
 [submodule "nvim/pack/syntaxes/start/vim-commentary"]
 	path = nvim/pack/syntaxes/start/vim-commentary
 	url = https://github.com/tpope/vim-commentary.git
@@ -22,3 +19,45 @@
 [submodule "nvim/pack/project/editorconfig-vim"]
 	path = nvim/pack/project/editorconfig-vim
 	url = https://github.com/editorconfig/editorconfig-vim.git
+[submodule "nvim/pack/visuals/start/vim-rainbow"]
+	path = nvim/pack/visuals/start/vim-rainbow
+	url = https://github.com/frazrepo/vim-rainbow.git
+[submodule "nvim/pack/syntaxes/start/pgsql.vim"]
+	path = nvim/pack/syntaxes/start/pgsql.vim
+	url = https://github.com/lifepillar/pgsql.vim.git
+[submodule "nvim/pack/syntaxes/start/python-syntax"]
+	path = nvim/pack/syntaxes/start/python-syntax
+	url = https://github.com/vim-python/python-syntax.git
+[submodule "nvim/pack/syntaxes/start/vim-python-pep8-indent"]
+	path = nvim/pack/syntaxes/start/vim-python-pep8-indent
+	url = https://github.com/Vimjas/vim-python-pep8-indent.git
+[submodule "nvim/pack/syntaxes/start/vim-compiler-python"]
+	path = nvim/pack/syntaxes/start/vim-compiler-python
+	url = https://github.com/aliev/vim-compiler-python.git
+[submodule "nvim/pack/syntaxes/start/rust.vim"]
+	path = nvim/pack/syntaxes/start/rust.vim
+	url = https://github.com/rust-lang/rust.vim.git
+[submodule "nvim/pack/syntaxes/start/vim-sh"]
+	path = nvim/pack/syntaxes/start/vim-sh
+	url = https://github.com/arzg/vim-sh.git
+[submodule "nvim/pack/syntaxes/start/vim-systemd-syntax"]
+	path = nvim/pack/syntaxes/start/vim-systemd-syntax
+	url = https://github.com/wgwoods/vim-systemd-syntax.git
+[submodule "nvim/pack/syntaxes/start/vim-toml"]
+	path = nvim/pack/syntaxes/start/vim-toml
+	url = https://github.com/cespare/vim-toml.git
+[submodule "nvim/pack/syntaxes/start/ansible-vim"]
+	path = nvim/pack/syntaxes/start/ansible-vim
+	url = https://github.com/pearofducks/ansible-vim.git
+[submodule "nvim/pack/syntaxes/start/vim-cpp"]
+	path = nvim/pack/syntaxes/start/vim-cpp
+	url = https://github.com/vim-jp/vim-cpp.git
+[submodule "nvim/pack/syntaxes/start/vim-git"]
+	path = nvim/pack/syntaxes/start/vim-git
+	url = https://github.com/tpope/vim-git.git
+[submodule "nvim/pack/syntaxes/start/vim-json"]
+	path = nvim/pack/syntaxes/start/vim-json
+	url = https://github.com/elzr/vim-json.git
+[submodule "nvim/pack/syntaxes/start/vim-mustache-handlebars"]
+	path = nvim/pack/syntaxes/start/vim-mustache-handlebars
+	url = https://github.com/mustache/vim-mustache-handlebars.git
diff --git a/nvim/pack/syntaxes/start/ansible-vim b/nvim/pack/syntaxes/start/ansible-vim
new file mode 160000
index 0000000..cfdde31
--- /dev/null
+++ b/nvim/pack/syntaxes/start/ansible-vim
@@ -0,0 +1 @@
+Subproject commit cfdde31672bce2f60bedc36842ab9bca8d28ba5b
diff --git a/nvim/pack/syntaxes/start/pgsql.vim b/nvim/pack/syntaxes/start/pgsql.vim
new file mode 160000
index 0000000..1953c08
--- /dev/null
+++ b/nvim/pack/syntaxes/start/pgsql.vim
@@ -0,0 +1 @@
+Subproject commit 1953c084f265514646455257b2b743add733918f
diff --git a/nvim/pack/syntaxes/start/python-syntax b/nvim/pack/syntaxes/start/python-syntax
new file mode 160000
index 0000000..c1c5baf
--- /dev/null
+++ b/nvim/pack/syntaxes/start/python-syntax
@@ -0,0 +1 @@
+Subproject commit c1c5bafb6d2333d25e415eb2ec2d0a54a59a21b4
diff --git a/nvim/pack/syntaxes/start/rust.vim b/nvim/pack/syntaxes/start/rust.vim
new file mode 160000
index 0000000..96e79e3
--- /dev/null
+++ b/nvim/pack/syntaxes/start/rust.vim
@@ -0,0 +1 @@
+Subproject commit 96e79e397126be1a64fb53d8e3656842fe1a4532
diff --git a/nvim/pack/syntaxes/start/vim-compiler-python b/nvim/pack/syntaxes/start/vim-compiler-python
new file mode 160000
index 0000000..92cfe1b
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-compiler-python
@@ -0,0 +1 @@
+Subproject commit 92cfe1b5cd6eedbd2dcd0e9c45eda7083a08107b
diff --git a/nvim/pack/syntaxes/start/vim-cpp b/nvim/pack/syntaxes/start/vim-cpp
new file mode 160000
index 0000000..1c9c604
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-cpp
@@ -0,0 +1 @@
+Subproject commit 1c9c60423cae1381b576c7714f5753c92bb43add
diff --git a/nvim/pack/syntaxes/start/vim-git b/nvim/pack/syntaxes/start/vim-git
new file mode 160000
index 0000000..4be54a3
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-git
@@ -0,0 +1 @@
+Subproject commit 4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886
diff --git a/nvim/pack/syntaxes/start/vim-json b/nvim/pack/syntaxes/start/vim-json
new file mode 160000
index 0000000..3727f08
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-json
@@ -0,0 +1 @@
+Subproject commit 3727f089410e23ae113be6222e8a08dd2613ecf2
diff --git a/nvim/pack/syntaxes/start/vim-mustache-handlebars b/nvim/pack/syntaxes/start/vim-mustache-handlebars
new file mode 160000
index 0000000..fcc1401
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-mustache-handlebars
@@ -0,0 +1 @@
+Subproject commit fcc1401c2f783c14314ef22517a525a884c549ac
diff --git a/nvim/pack/syntaxes/start/vim-polyglot b/nvim/pack/syntaxes/start/vim-polyglot
deleted file mode 160000
index a4b9112..0000000
--- a/nvim/pack/syntaxes/start/vim-polyglot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a4b91124a8fea26575d08c1845e141520e7d33e2
diff --git a/nvim/pack/syntaxes/start/vim-python-pep8-indent b/nvim/pack/syntaxes/start/vim-python-pep8-indent
new file mode 160000
index 0000000..60ba5e1
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-python-pep8-indent
@@ -0,0 +1 @@
+Subproject commit 60ba5e11a61618c0344e2db190210145083c91f8
diff --git a/nvim/pack/syntaxes/start/vim-sh b/nvim/pack/syntaxes/start/vim-sh
new file mode 160000
index 0000000..cebda39
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-sh
@@ -0,0 +1 @@
+Subproject commit cebda390c56654a4c9f96f66727e9be076a7aee3
diff --git a/nvim/pack/syntaxes/start/vim-systemd-syntax b/nvim/pack/syntaxes/start/vim-systemd-syntax
new file mode 160000
index 0000000..2f788c6
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-systemd-syntax
@@ -0,0 +1 @@
+Subproject commit 2f788c627efa7a50baa5766cfacf1852528eca28
diff --git a/nvim/pack/syntaxes/start/vim-toml b/nvim/pack/syntaxes/start/vim-toml
new file mode 160000
index 0000000..897cb4e
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-toml
@@ -0,0 +1 @@
+Subproject commit 897cb4eaa81a0366bc859effe14116660d4015cd
diff --git a/nvim/pack/visuals/start/vim-rainbow b/nvim/pack/visuals/start/vim-rainbow
new file mode 160000
index 0000000..a6c7fd5
--- /dev/null
+++ b/nvim/pack/visuals/start/vim-rainbow
@@ -0,0 +1 @@
+Subproject commit a6c7fd5a2b0193b5dbd03f62ad820b521dea3290