diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 5de58b7..a8a1bd7 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -25,8 +25,8 @@ Plug 'tpope/vim-commentary'
 " Theme
 Plug 'tomasr/molokai'
 Plug 'fmoralesc/molokayo'
-Plug 'justinmk/vim-syntax-extra'
-Plug 'octol/vim-cpp-enhanced-highlight'
+" Syntax highlighting
+Plug 'sheerun/vim-polyglot'
 " Autoload and read from dish if file changes
 Plug 'tmux-plugins/vim-tmux-focus-events'
 Plug 'wellle/tmux-complete.vim'
@@ -49,34 +49,24 @@ Plug 'guns/vim-sexp', { 'for': [ 'scheme', 'lisp', 'clojure' ] }
 Plug 'tpope/vim-sexp-mappings-for-regular-people', { 'for': [ 'scheme', 'lisp', 'clojure' ] }
 Plug 'junegunn/rainbow_parentheses.vim', { 'for': [ 'scheme', 'lisp', 'clojure' ] }
 Plug 'kovisoft/slimv', { 'for': [ 'scheme', 'lisp', 'clojure' ] }
-Plug 'wlangstroth/vim-racket'
 " Haskell
-Plug 'ekmett/haskell-vim', { 'for': [ 'haskell', 'cabal' ] }
 Plug 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' }
 Plug 'Twinside/vim-hoogle', { 'for': 'haskell' }
 Plug 'hspec/hspec.vim'
 Plug 'pbrisbin/vim-syntax-shakespeare'
 Plug 'zenzike/vim-haskell-unicode', { 'for': 'haskell' }
 Plug 'godlygeek/tabular'
-" For Nix
-Plug 'LnL7/vim-nix', { 'for': 'nix' }
 " For autocompletion
 Plug 'prabirshrestha/asyncomplete.vim'
 Plug 'prabirshrestha/asyncomplete-buffer.vim'
 Plug 'prabirshrestha/asyncomplete-file.vim'
 Plug 'prabirshrestha/asyncomplete-tags.vim'
-Plug 'Guzzii/python-syntax'
-" Autocomplete for Rust
-Plug 'cespare/vim-toml', { 'for': 'rust' }
-Plug 'rust-lang/rust.vim', { 'for': 'rust' }
+" Rust
 Plug 'mhinz/vim-crates'
 " Erlang Support
 Plug 'vim-erlang/vim-erlang-tags', { 'for': 'erlang' }
-Plug 'vim-erlang/vim-erlang-runtime', { 'for': 'erlang' }
 Plug 'vim-erlang/vim-erlang-omnicomplete', { 'for': 'erlang' }
 Plug 'vim-erlang/vim-erlang-compiler', { 'for': 'erlang' }
-" Purescript
-Plug 'purescript-contrib/purescript-vim', { 'for': 'purescript' }
 " Neo/Async stuff
 Plug 'sbdchd/neoformat'
 Plug 'neomake/neomake'
@@ -93,10 +83,6 @@ Plug 'tpope/vim-vinegar'
 Plug 'wellle/targets.vim'
 Plug 'Yggdroot/indentLine'
 Plug 'esamattis/slimux'
-" Miscellaneous language syntax specific
-Plug 'vmchale/dhall-vim'
-Plug 'dag/vim-fish'
-Plug 'lifepillar/pgsql.vim'
 " LC related
 Plug 'liuchengxu/vista.vim'
 Plug 'prabirshrestha/async.vim'