diff --git a/roles/cui/templates/.config/nvim/lua/plugins/init.lua b/roles/cui/templates/.config/nvim/lua/plugins/init.lua
index 5ddef6d..5995f39 100644
--- a/roles/cui/templates/.config/nvim/lua/plugins/init.lua
+++ b/roles/cui/templates/.config/nvim/lua/plugins/init.lua
@@ -1,5 +1,13 @@
 return {
-	{ "RRethy/vim-illuminate" },
+	{
+		"RRethy/vim-illuminate",
+		event = { "BufReadPost", "BufNewFile" },
+		config = function()
+			require("illuminate").configure({
+				providers = { "lsp", "regex" },
+			})
+		end,
+	},
 	{ "andymass/vim-matchup" },
 	{ "hashivim/vim-terraform" },
 	{
@@ -52,7 +60,14 @@ return {
 	},
 	{ "williamboman/mason-lspconfig.nvim" },
 	{ "williamboman/mason.nvim" },
-	{ "windwp/nvim-ts-autotag" },
+	{
+		"windwp/nvim-ts-autotag",
+		event = "InsertEnter",
+		dependencies = { "nvim-treesitter/nvim-treesitter" },
+		config = function()
+			require("nvim-ts-autotag").setup()
+		end,
+	},
 	{
 		"zbirenbaum/copilot.lua",
 		cmd = "Copilot",
diff --git a/roles/cui/templates/.config/nvim/lua/plugins/nvim-lspconfig.lua b/roles/cui/templates/.config/nvim/lua/plugins/nvim-lspconfig.lua
index 6f011f5..e067e80 100644
--- a/roles/cui/templates/.config/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/roles/cui/templates/.config/nvim/lua/plugins/nvim-lspconfig.lua
@@ -29,7 +29,7 @@ return {
 
     -- Set up mason-lspconfig with handlers
     require("mason-lspconfig").setup({
-      ensure_installed = { "rust_analyzer", "ts_ls", "eslint", "oxc" },
+      ensure_installed = { "rust_analyzer", "ts_ls", "eslint", "oxlint" },
       automatic_installation = true,
       handlers = {
         -- Default handler - will be called for each installed server