diff --git a/.gitmodules b/.gitmodules
index ae9b843..57a2a27 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,45 +22,6 @@
 [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
-[submodule "nvim/pack/syntaxes/start/rainbow_csv"]
-	path = nvim/pack/syntaxes/start/rainbow_csv
-	url = https://github.com/mechatroner/rainbow_csv.git
+[submodule "nvim/pack/syntaxes/start/vim-polyglot"]
+	path = nvim/pack/syntaxes/start/vim-polyglot
+	url = https://github.com/sheerun/vim-polyglot.git
diff --git a/nvim/init.vim b/nvim/init.vim
index 87e484d..06e49a0 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -60,6 +60,11 @@ let g:airline#extensions#tabline#formatter = 'unique_tail'
 " Skim {{{
 nmap <silent> <Leader><Space> :SK<CR>
 " }}}
+
+" Polyglot {{{
+let g:polyglot_disabled = ["csv"]
+" }}}
+
 " }}}
 
 " Filetype specific configurations {{{
diff --git a/nvim/pack/syntaxes/start/ansible-vim b/nvim/pack/syntaxes/start/ansible-vim
deleted file mode 160000
index cfdde31..0000000
--- a/nvim/pack/syntaxes/start/ansible-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cfdde31672bce2f60bedc36842ab9bca8d28ba5b
diff --git a/nvim/pack/syntaxes/start/pgsql.vim b/nvim/pack/syntaxes/start/pgsql.vim
deleted file mode 160000
index 1953c08..0000000
--- a/nvim/pack/syntaxes/start/pgsql.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1953c084f265514646455257b2b743add733918f
diff --git a/nvim/pack/syntaxes/start/python-syntax b/nvim/pack/syntaxes/start/python-syntax
deleted file mode 160000
index c1c5baf..0000000
--- a/nvim/pack/syntaxes/start/python-syntax
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c1c5bafb6d2333d25e415eb2ec2d0a54a59a21b4
diff --git a/nvim/pack/syntaxes/start/rainbow_csv b/nvim/pack/syntaxes/start/rainbow_csv
deleted file mode 160000
index df89266..0000000
--- a/nvim/pack/syntaxes/start/rainbow_csv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit df89266d6c03479def77793fd7a0a651986865a5
diff --git a/nvim/pack/syntaxes/start/rust.vim b/nvim/pack/syntaxes/start/rust.vim
deleted file mode 160000
index 96e79e3..0000000
--- a/nvim/pack/syntaxes/start/rust.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 96e79e397126be1a64fb53d8e3656842fe1a4532
diff --git a/nvim/pack/syntaxes/start/vim-compiler-python b/nvim/pack/syntaxes/start/vim-compiler-python
deleted file mode 160000
index 92cfe1b..0000000
--- a/nvim/pack/syntaxes/start/vim-compiler-python
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 92cfe1b5cd6eedbd2dcd0e9c45eda7083a08107b
diff --git a/nvim/pack/syntaxes/start/vim-cpp b/nvim/pack/syntaxes/start/vim-cpp
deleted file mode 160000
index 1c9c604..0000000
--- a/nvim/pack/syntaxes/start/vim-cpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1c9c60423cae1381b576c7714f5753c92bb43add
diff --git a/nvim/pack/syntaxes/start/vim-git b/nvim/pack/syntaxes/start/vim-git
deleted file mode 160000
index 4be54a3..0000000
--- a/nvim/pack/syntaxes/start/vim-git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886
diff --git a/nvim/pack/syntaxes/start/vim-json b/nvim/pack/syntaxes/start/vim-json
deleted file mode 160000
index 3727f08..0000000
--- a/nvim/pack/syntaxes/start/vim-json
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3727f089410e23ae113be6222e8a08dd2613ecf2
diff --git a/nvim/pack/syntaxes/start/vim-mustache-handlebars b/nvim/pack/syntaxes/start/vim-mustache-handlebars
deleted file mode 160000
index fcc1401..0000000
--- a/nvim/pack/syntaxes/start/vim-mustache-handlebars
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fcc1401c2f783c14314ef22517a525a884c549ac
diff --git a/nvim/pack/syntaxes/start/vim-polyglot b/nvim/pack/syntaxes/start/vim-polyglot
new file mode 160000
index 0000000..a4b9112
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-polyglot
@@ -0,0 +1 @@
+Subproject commit a4b91124a8fea26575d08c1845e141520e7d33e2
diff --git a/nvim/pack/syntaxes/start/vim-python-pep8-indent b/nvim/pack/syntaxes/start/vim-python-pep8-indent
deleted file mode 160000
index 60ba5e1..0000000
--- a/nvim/pack/syntaxes/start/vim-python-pep8-indent
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 60ba5e11a61618c0344e2db190210145083c91f8
diff --git a/nvim/pack/syntaxes/start/vim-sh b/nvim/pack/syntaxes/start/vim-sh
deleted file mode 160000
index cebda39..0000000
--- a/nvim/pack/syntaxes/start/vim-sh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cebda390c56654a4c9f96f66727e9be076a7aee3
diff --git a/nvim/pack/syntaxes/start/vim-systemd-syntax b/nvim/pack/syntaxes/start/vim-systemd-syntax
deleted file mode 160000
index 2f788c6..0000000
--- a/nvim/pack/syntaxes/start/vim-systemd-syntax
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f788c627efa7a50baa5766cfacf1852528eca28
diff --git a/nvim/pack/syntaxes/start/vim-toml b/nvim/pack/syntaxes/start/vim-toml
deleted file mode 160000
index 897cb4e..0000000
--- a/nvim/pack/syntaxes/start/vim-toml
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 897cb4eaa81a0366bc859effe14116660d4015cd