diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..a8c63b1
Binary files /dev/null and b/.DS_Store differ
diff --git a/lazy-lock.json b/lazy-lock.json
index a40098d..f30c8f6 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,22 +9,22 @@
   "copilot.vim": { "branch": "release", "commit": "a12fd5672110c8aa7e3c8419e28c96943ca179be" },
   "dashboard-nvim": { "branch": "master", "commit": "f787e3462c2ee2b6117b17c1aa4ddf66cb6f57fe" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "flutter-tools.nvim": { "branch": "main", "commit": "677cc07c16e8b89999108d2ebeefcfc5f539b73c" },
+  "flutter-tools.nvim": { "branch": "main", "commit": "7fc434e99297af83cba10deff008be53a008a6d5" },
   "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "log-highlight.nvim": { "branch": "main", "commit": "ca88628f6dd3b9bb46f9a7401669e24cf7de47a4" },
-  "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "0a3b42c3e503df87aef6d6513e13148381495c3a" },
-  "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" },
+  "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" },
+  "mason.nvim": { "branch": "main", "commit": "cb8445f8ce85d957416c106b780efd51c6298f89" },
   "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
   "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
   "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4b7fbaa239c5db6b36f424a4521ca9f1a401be33" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b66a8ce16b141cd26576267e2d1f371d658b7bb7" },
   "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
   "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4fc505ac7bd7692824a142e96e5f529c133862f8" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
   "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
diff --git a/lua/.DS_Store b/lua/.DS_Store
new file mode 100644
index 0000000..e37feff
Binary files /dev/null and b/lua/.DS_Store differ
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 72d053c..49abeaa 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -1,34 +1,30 @@
 return {
 	"nvim-treesitter/nvim-treesitter",
-	lazy = false,
+	lazy = false, -- Treesitter must not be lazy-loaded in the new version
 	build = ":TSUpdate",
 	config = function()
-		require("nvim-treesitter").setup({
+		local ts = require("nvim-treesitter")
+		local supported_languages = {
+			"lua", "vim", "vimdoc", "query", "dart", "python",
+			"dockerfile", "yaml", "bash", "json", "html",
+			"css", "javascript", "sql", "markdown", "markdown_inline",
+		}
+		-- 1. Global Settings
+		ts.setup({
 			install_dir = vim.fn.stdpath("data") .. "/site",
-			highlight = {
-				enable = true,
-				-- additional_vim_regex_highlighting = false,
-			},
-			indent = { enable = true },
-			autotag = { enable = true },
-			ensure_installed = {
-				"lua",
-				"vim",
-				"vimdoc",
-				"query",
-				"dart",
-				"python",
-				"dockerfile",
-				"yaml",
-				"bash",
-				"json",
-				"html",
-				"css",
-				"javascript",
-				"sql",
-				"markdown",
-				"markdown_inline",
-			},
+			auto_install = true,
+		})
+		-- 2. Bulk Install Parsers (Asynchronous)
+		ts.install(supported_languages)
+		-- 3. Enable Highlighting	
+		vim.api.nvim_create_autocmd("FileType", {
+			pattern = supported_languages,
+			callback = function()
+				local lang = vim.treesitter.language.get_lang(vim.bo.filetype)
+				if lang then
+					vim.treesitter.start()
+				end
+			end,
 		})
 	end,
 }