diff --git a/nvim/init.lua b/nvim/init.lua
index 66f473a..e2257d1 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -4,6 +4,7 @@ require 'plugins'
 require 'options'
 require 'autocomplete'
 require 'maps'
+require 'treesitter_config'
 
 -- Misc
 -- ====
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index e71e430..a24fffd 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -22,6 +22,7 @@ return require('packer').startup(function()
   use 'vim-airline/vim-airline'
   use 'vim-airline/vim-airline-themes'
   -- TODO: 'edkolev/tmuxline.vim'
+  use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
   use 'vim-test/vim-test'
   use 'hrsh7th/nvim-compe'
   -- Color scheme
diff --git a/nvim/lua/treesitter_config.lua b/nvim/lua/treesitter_config.lua
new file mode 100644
index 0000000..d4d2d5d
--- /dev/null
+++ b/nvim/lua/treesitter_config.lua
@@ -0,0 +1,6 @@
+require('nvim-treesitter.configs').setup {
+    ensure_installed = 'maintained',
+    highlight = {
+        enable = true
+    }
+}