diff --git a/config/nvim/lua/commands.lua b/config/nvim/lua/commands.lua
index b9e2983..8964697 100644
--- a/config/nvim/lua/commands.lua
+++ b/config/nvim/lua/commands.lua
@@ -6,6 +6,15 @@ local debug = false
 -- nvim_create_user_command({name}, {command}, {*opts})
 local cmd = vim.api.nvim_create_user_command
 
+-- https://github.com/nvim-treesitter/nvim-treesitter/wiki/Installation
+vim.api.nvim_create_autocmd({'BufEnter','BufAdd','BufNew','BufNewFile','BufWinEnter'}, {
+  group = vim.api.nvim_create_augroup('TS_FOLD_WORKAROUND', {}),
+  callback = function()
+    vim.opt.foldmethod     = 'expr'
+    vim.opt.foldexpr       = 'nvim_treesitter#foldexpr()'
+  end
+})
+
 -- Packer commands
 cmd('Pac', function (cmd)
   vim.cmd 'packadd packer.nvim'
diff --git a/config/nvim/lua/config/treesitter.lua b/config/nvim/lua/config/treesitter.lua
index e6fde7c..6687629 100644
--- a/config/nvim/lua/config/treesitter.lua
+++ b/config/nvim/lua/config/treesitter.lua
@@ -7,10 +7,11 @@ require('nvim-treesitter.configs').setup({
   ensure_installed = 'all',
   -- ensure_installed = { 'bash', 'cmake', 'comment', 'cpp', 'css', 'dart', 'dockerfile', 'go', 'graphql', 'html', 'javascript', 'json', 'jsonc', 'lua', 'php', 'python', 'regex', 'ruby', 'scss', 'svelte', 'toml', 'tsx', 'typescript', 'vim', 'vue', 'yaml' },
   sync_install = true,
+  auto_install = true,
   highlight = {
     enable = true,
     use_languagetree= true,
-    addtional_vim_regex_highlighting = true,
+    addtional_vim_regex_highlighting = false,
   },
   incremental_selection = {
     enable = true,
diff --git a/config/nvim/lua/lsp/init.lua b/config/nvim/lua/lsp/init.lua
index bd384fd..f40fa50 100644
--- a/config/nvim/lua/lsp/init.lua
+++ b/config/nvim/lua/lsp/init.lua
@@ -63,7 +63,7 @@ end
 
 -- Setup lspconfig with snippet support
 local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
+capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 
 for _, lsp in ipairs(servers) do
   lspconfig[lsp].setup {