diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index 007aaef..03af220 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -1,23 +1,57 @@
 return {
 	"nvim-treesitter/nvim-treesitter",
-	lazy = false,
+	lazy = false, -- Keep false to ensure loading for Neo-tree
 	build = ":TSUpdate",
 	config = function()
-		require("nvim-treesitter.configs").setup({
-			ensure_installed = {
+		local treesitter = require("nvim-treesitter")
+		treesitter.setup()
+		treesitter.install({
+			"java",
+			"c",
+			"lua",
+			"vim",
+			"vimdoc",
+			"query",
+			-- "elixir",
+			-- "heex",
+			"markdown",
+			"markdown_inline",
+			"bash",
+			"javascript",
+			"typescript",
+			"html",
+			"toml",
+			"yaml",
+		})
+
+		vim.api.nvim_create_autocmd("FileType", {
+			pattern = {
+				"java",
 				"c",
 				"lua",
 				"vim",
 				"vimdoc",
 				"query",
+				-- "elixir",
+				-- "heex",
 				"markdown",
 				"markdown_inline",
 				"bash",
 				"javascript",
+				"typescript",
+				"html",
 				"toml",
+				"yaml",
 			},
-			auto_install = false,
-			-- ...
+			callback = function()
+				-- syntax highlighting, provided by Neovim
+				vim.treesitter.start()
+				-- folds, provided by Neovim (I don't like folds)
+				-- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+				-- vim.wo.foldmethod = 'expr'
+				-- indentation, provided by nvim-treesitter
+				vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+			end,
 		})
 	end,
 }