diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 1f6c51e..ed0df01 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -73,8 +73,8 @@ Plug 'neovimhaskell/haskell-vim'
 Plug 'Twinside/vim-hoogle', { 'for': 'haskell' }
 Plug 'godlygeek/tabular', { 'for': 'haskell' }
 Plug 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' }
-" Rust
-Plug 'rust-lang/rust.vim', { 'for': 'rust' }
+" For C, Lua and Rust
+Plug 'nvim-treesitter/nvim-treesitter'
 " Purescript
 Plug 'purescript-contrib/purescript-vim'
  " Erlang
@@ -82,17 +82,11 @@ Plug 'vim-erlang/vim-erlang-runtime', { 'for': 'erlang' }
 Plug 'vim-erlang/vim-erlang-tags', { 'for': 'erlang' }
 Plug 'vim-erlang/vim-erlang-omnicomplete', { 'for': 'erlang' }
 Plug 'vim-erlang/vim-erlang-compiler', { 'for': 'erlang' }
-" C/C++
-Plug 'vim-jp/vim-cpp'
-Plug 'octol/vim-cpp-enhanced-highlight'
-Plug 'FromtonRouge/OmniCppComplete'
 " LaTeX
 Plug 'lervag/vimtex'
 " Dhall & nix
 Plug 'vmchale/dhall-vim'
 Plug 'LnL7/vim-nix'
-" Lua
-Plug 'wsdjeg/vim-lua'
 " Other syntax highlighting support
 Plug 'georgewitteman/vim-fish'
 Plug 'elzr/vim-json'
diff --git a/nvim/.config/nvim/lua/treesitter.lua b/nvim/.config/nvim/lua/treesitter.lua
new file mode 100644
index 0000000..3c4ff15
--- /dev/null
+++ b/nvim/.config/nvim/lua/treesitter.lua
@@ -0,0 +1,6 @@
+require'nvim-treesitter.configs'.setup {
+  ensure_installed = { "c", "cpp", "lua", "rust" },
+  highlight = {
+    enable = true,
+  },
+}
diff --git a/nvim/.config/nvim/plugin_settings.vim b/nvim/.config/nvim/plugin_settings.vim
index d8fa894..6e564ba 100644
--- a/nvim/.config/nvim/plugin_settings.vim
+++ b/nvim/.config/nvim/plugin_settings.vim
@@ -101,3 +101,4 @@ let g:completion_chain_complete_list = {
   \}
 
 lua require 'lsp'
+lua require 'treesitter'