diff --git a/.config/nvim/lua/plugins/nvim-lspconfig.lua b/.config/nvim/lua/plugins/nvim-lspconfig.lua
index 7347909..1de5975 100644
--- a/.config/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/.config/nvim/lua/plugins/nvim-lspconfig.lua
@@ -28,13 +28,13 @@ return {
         -- c
         "clangd",
         -- docker
-        "dockerls",
+        -- "dockerls", -- TODO: needs extra steps to install (npm)
         -- go
-        "gopls",
+        -- "gopls", -- TODO: needs extra steps to install (go)
         -- html
-        "html",
+        -- "html", -- TODO: needs extra steps to install (npm)
         -- json
-        "jsonls",
+        -- "jsonls", -- TODO: needs extra steps to install (npm)
         -- xml
         "lemminx",
         -- latex
@@ -47,17 +47,17 @@ return {
         -- nim
         -- "nimls", -- TODO: needs extra steps to install (nimble)
         -- python
-        "pyright",
+        -- "pyright", -- TODO: needs extra steps to install (npm)
         -- r
         -- "r_language_server", -- TODO: installation takes really long
         -- shell
-        "bashls",
+        -- "bashls", -- TODO: needs extra steps to install (npm)
         -- sql
-        "sqlls",
+        -- "sqlls", -- TODO: needs extra steps to install (npm)
         -- typescript / javascript
-        "ts_ls",
+        -- "ts_ls", -- TODO: needs extra steps to install (npm)
         -- yaml
-        "yamlls",
+        -- "yamlls", -- TODO: needs extra steps to install (npm)
       },
     })
     local default_flags = {
diff --git a/.config/nvim/lua/plugins/nvim-treesitter.lua b/.config/nvim/lua/plugins/nvim-treesitter.lua
index ca4835b..96ea786 100644
--- a/.config/nvim/lua/plugins/nvim-treesitter.lua
+++ b/.config/nvim/lua/plugins/nvim-treesitter.lua
@@ -9,8 +9,9 @@ return {
     -- 'p00f/nvim-ts-rainbow',
   },
   config = function()
-    require("nvim-treesitter.config").setup({
-      ensure_installed = {
+    local treesitter = require("nvim-treesitter")
+    treesitter.setup()
+    treesitter.install({
         "bash",
         "css",
         "html",
@@ -21,16 +22,20 @@ return {
         "rust",
         "lua",
         "yaml",
-      },
-      -- highlight = { enable = true },
-      autotag = { enable = false },
-      -- rainbow = {
-      --   enable = true,
-      --   extended_mode = true,
-      --   max_file_lines = nil,
-      --   -- colors = {},
-      --   -- termcolors = {}
-      -- }
     })
+    require("nvim-ts-autotag").setup({
+      opts = {
+        enable_close = true,
+        enable_rename = true,
+      }
+    })
+    -- WARN: not directly compatible anymore
+    -- highlight = { enable = true },
+    -- rainbow = {
+    --   enable = true,
+    --   extended_mode = true,
+    --   max_file_lines = nil,
+    --   -- colors = {},
+    --   -- termcolors = {}
   end,
 }