diff --git a/.config/nvim/lua/core/lazy.lua b/.config/nvim/lua/core/lazy.lua
index 388ad4d..4b25210 100644
--- a/.config/nvim/lua/core/lazy.lua
+++ b/.config/nvim/lua/core/lazy.lua
@@ -73,7 +73,23 @@ require("lazy").setup({
 		},
 		event = "VeryLazy",
 	},
-	{ "nvim-treesitter/nvim-treesitter", branch = "main", event = "BufReadPost" },
+	{
+		"romus204/tree-sitter-manager.nvim",
+		dependencies = {}, -- tree-sitter CLI must be installed system-wide
+		config = function()
+			require("tree-sitter-manager").setup({
+				-- Default Options
+				-- ensure_installed = {}, -- list of parsers to install at the start of a neovim session
+				-- border = nil, -- border style for the window (e.g. "rounded", "single"), if nil, use the default border style defined by 'vim.o.winborder'. See :h 'winborder' for more info.
+				-- auto_install = false, -- if enabled, install missing parsers when editing a new file
+				-- highlight = true, -- treesitter highlighting is enabled by default
+				-- languages = {}, -- override or add new parser sources
+				-- parser_dir = vim.fn.stdpath("data") .. "/site/parser",
+				-- query_dir = vim.fn.stdpath("data") .. "/site/queries",
+			})
+		end,
+	},
+
 	{
 		"folke/snacks.nvim",
 		priority = 1000,
diff --git a/.config/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua
index 2c8cf08..03d7fa7 100644
--- a/.config/nvim/lua/plugins/snacks.lua
+++ b/.config/nvim/lua/plugins/snacks.lua
@@ -42,7 +42,7 @@ require("snacks").setup({
 				indent = 2,
 			},
 			{ icon = "", desc = "Mason", action = ":Mason", key = "m", indent = 2 },
-			{ icon = "", desc = "Tree-sitter", action = ":TSUpdate", key = "t", indent = 2, padding = 2 },
+			-- { icon = "", desc = "Tree-sitter", action = ":TSUpdate", key = "t", indent = 2, padding = 2 },
 
 			{ section = "startup" },
 		},
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index c898f92..8b4610b 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -1,4 +1,4 @@
-require("nvim-treesitter.config").setup({
+require("tree-sitter-manager").setup({
 	ensure_installed = {
 		"bash",
 		"comment",
@@ -31,11 +31,4 @@ require("nvim-treesitter.config").setup({
 		enable = true,
 		disable = { "css" },
 	},
-	autopairs = {
-		enable = true,
-	},
-	indent = {
-		enable = true,
-		disable = { "python", "css" },
-	},
 })