diff --git a/nvim/after/plugin/treesitter.lua b/nvim/after/plugin/treesitter.lua
deleted file mode 100644
index 7237c8f..0000000
--- a/nvim/after/plugin/treesitter.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-local ok, treesitter = pcall(require, "nvim-treesitter.configs")
-if not ok then
-    return
-end
-
-treesitter.setup {
-    highlight = {
-        enable = true,
-        additional_vim_regex_highlighting = { "php" },
-    },
-    indent = {
-        enable = false,
-    },
-    textobjects = {
-        select = {
-            enable = true,
-            keymaps = {
-                ["af"] = "@function.outer",
-                ["if"] = "@function.inner",
-                ["ia"] = "@parameter.inner",
-            },
-        },
-        swap = {
-            enable = true,
-            swap_next = {
-                ["<leader>@"] = "@parameter.inner",
-            },
-        },
-        move = {
-            enable = true,
-            goto_next_start = {
-                ["]]"] = "@function.outer",
-            },
-            goto_next_end = {
-                ["]["] = "@function.outer",
-            },
-            goto_previous_start = {
-                ["[["] = "@function.outer",
-            },
-            goto_previous_end = {
-                ["[]"] = "@function.outer",
-            },
-        },
-    },
-}
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index 88ba298..8e6f33d 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -12,12 +12,6 @@ return {
             require "my.telescope"
         end
     },
-    {
-        "nvim-treesitter/nvim-treesitter",
-        dependencies = {
-            "nvim-treesitter/nvim-treesitter-textobjects",
-        },
-    },
     {
         "windwp/nvim-autopairs",
         event = "InsertEnter",
@@ -69,6 +63,8 @@ return {
         version = '*',
         config = function()
             require "mini.statusline".setup()
+            require "mini.comment".setup()
+            require "mini.bufremove".setup()
         end
     },
 }
diff --git a/nvim/lua/plugins/theme.lua b/nvim/lua/plugins/theme.lua
index b7c17ef..e682193 100644
--- a/nvim/lua/plugins/theme.lua
+++ b/nvim/lua/plugins/theme.lua
@@ -5,7 +5,7 @@ return {
         priority = 1000, -- make sure to load this before all the other start plugins
         name = "catppuccin",
         opts = {
-            flavour = "latte", -- latte, frappe, macchiato, mocha
+            flavour = "frappe", -- latte, frappe, macchiato, mocha
             transparent_background = false,
             dim_inactive = {
                 enabled = true,
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
new file mode 100644
index 0000000..c154463
--- /dev/null
+++ b/nvim/lua/plugins/treesitter.lua
@@ -0,0 +1,57 @@
+return {
+    {
+        "nvim-treesitter/nvim-treesitter",
+        build = ":TSUpdate",
+        event = { "VeryLazy" },
+        dependencies = {
+            "nvim-treesitter/nvim-treesitter-textobjects",
+        },
+        opts = {
+            highlight = {
+                enable = true,
+                additional_vim_regex_highlighting = { "php" },
+            },
+            indent = {
+                enable = false,
+            },
+            textobjects = {
+                select = {
+                    enable = true,
+                    keymaps = {
+                        ["af"] = "@function.outer",
+                        ["if"] = "@function.inner",
+                        ["ia"] = "@parameter.inner",
+                    },
+                },
+                swap = {
+                    enable = true,
+                    swap_next = {
+                        ["<leader>@"] = "@parameter.inner",
+                    },
+                },
+                move = {
+                    enable = true,
+                    goto_next_start = {
+                        ["]]"] = "@function.outer",
+                    },
+                    goto_next_end = {
+                        ["]["] = "@function.outer",
+                    },
+                    goto_previous_start = {
+                        ["[["] = "@function.outer",
+                    },
+                    goto_previous_end = {
+                        ["[]"] = "@function.outer",
+                    },
+                },
+            },
+        },
+        config = function(_, opts)
+            require("nvim-treesitter.configs").setup(opts)
+        end,
+    },
+    {
+        "windwp/nvim-ts-autotag",
+        opts = {},
+    },
+}