diff --git a/lua/nvchad/autocmds.lua b/lua/nvchad/autocmds.lua
index 47437aa..5c7767a 100644
--- a/lua/nvchad/autocmds.lua
+++ b/lua/nvchad/autocmds.lua
@@ -25,3 +25,18 @@ autocmd({ "UIEnter", "BufReadPost", "BufNewFile" }, {
     end
   end,
 })
+
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = "*",
+  callback = function()
+    pcall(vim.treesitter.start)
+  end,
+})
+
+local create_cmd = vim.api.nvim_create_user_command
+
+create_cmd("TSInstallAll", function()
+  local spec = require("lazy.core.config").plugins["nvim-treesitter"]
+  local opts = type(spec.opts) == "table" and spec.opts or {}
+  require("nvim-treesitter").install(opts.ensure_installed)
+end, {})
diff --git a/lua/nvchad/configs/treesitter.lua b/lua/nvchad/configs/treesitter.lua
index 5b9818b..92aef72 100644
--- a/lua/nvchad/configs/treesitter.lua
+++ b/lua/nvchad/configs/treesitter.lua
@@ -5,11 +5,4 @@ end)
 
 return {
   ensure_installed = { "lua", "luadoc", "printf", "vim", "vimdoc" },
-
-  highlight = {
-    enable = true,
-    use_languagetree = true,
-  },
-
-  indent = { enable = true },
 }
diff --git a/lua/nvchad/plugins/init.lua b/lua/nvchad/plugins/init.lua
index 6cd5d18..c1089c0 100644
--- a/lua/nvchad/plugins/init.lua
+++ b/lua/nvchad/plugins/init.lua
@@ -156,15 +156,11 @@ return {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    branch = "master",
     event = { "BufReadPost", "BufNewFile" },
     cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" },
-    build = ":TSUpdate",
+    build = ":TSUpdate | TSInstallAll",
     opts = function()
       return require "nvchad.configs.treesitter"
     end,
-    config = function(_, opts)
-      require("nvim-treesitter.configs").setup(opts)
-    end,
   },
 }