diff --git a/lazy-lock.json b/lazy-lock.json
index 5d8fae0..608f35d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,50 +1,50 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "7d08b780201a4a7c9c117a3855492fdd6318380f" },
-  "avante.nvim": { "branch": "main", "commit": "0b78b58760a5fd257797936e74e0bf5ddb445de1" },
+  "LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" },
+  "avante.nvim": { "branch": "main", "commit": "0613b1f307bee8419fb9cede07aad9526bf85585" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
+  "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "evergarden": { "branch": "mega", "commit": "de538e9aac1358872c118e0d7bc45462fc8205c8" },
+  "evergarden": { "branch": "mega", "commit": "f8bda159eb756bd615d250aae819459b55b30399" },
   "format-ts-errors.nvim": { "branch": "main", "commit": "4b7418d6689bc0fd3c1db0500c67133422522384" },
-  "gitsigns.nvim": { "branch": "main", "commit": "056d5ea359efe35c4e25e2ebcc255117ac86500d" },
-  "go.nvim": { "branch": "master", "commit": "37ec4d9be3edef64b725bfe29684e1fe019873bc" },
-  "img-clip.nvim": { "branch": "main", "commit": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1b0350ab707713b2bc6c236151f1a324175347b1" },
+  "go.nvim": { "branch": "master", "commit": "a3455f48cff718a86275115523dcc735535a13aa" },
+  "img-clip.nvim": { "branch": "main", "commit": "d8b6b030672f9f551a0e3526347699985a779d93" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lackluster.nvim": { "branch": "main", "commit": "d2519d14b2b6e9eef05752d5d4486ed5c48d6178" },
+  "lackluster.nvim": { "branch": "main", "commit": "b247a6f51cb43e49f3f753f4a59553b698bf5438" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lsp-zero.nvim": { "branch": "v4.x", "commit": "2afa32e732d7b36e80cd5241fbdc4a38e123c4e0" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "a793d02b6a5e639fa9d3f2a89a839fa688ab2d0a" },
+  "lsp-zero.nvim": { "branch": "v4.x", "commit": "d502a22640d0ff4752547c6d71f117a1bb2bb653" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "2923666d092300e6d03c8d895991d0bef43f1613" },
   "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
   "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" },
   "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "c4c84f4521d62de595c0d0f718a9a40c1890c8ce" },
+  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
   "mellow.nvim": { "branch": "main", "commit": "c5c289b3254b5648ca25a691558559f260d99b84" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" },
-  "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5e0e9c00d51fcb7efef0d4c49023f9593b38661e" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" },
-  "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" },
+  "oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "rasmus.nvim": { "branch": "main", "commit": "49f7ee7bf3eb00db52c77f84b15bc69f318bafc1" },
-  "render-markdown.nvim": { "branch": "main", "commit": "fa92c30f59afa980708e110824ff0933bc0954e5" },
+  "render-markdown.nvim": { "branch": "main", "commit": "24aacee83544ca113055564ed22be7852067c342" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
-  "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "typescript-tools.nvim": { "branch": "master", "commit": "3c501d7c7f79457932a8750a2a1476a004c5c1a9" },
   "vim-bujo": { "branch": "master", "commit": "ee3fecb5b3206b8073ac3fe4153391f320c99197" },
-  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
-  "zenbones.nvim": { "branch": "main", "commit": "9deaa8a38e43e8c587b427095dd43c3511255b21" }
+  "vim-fugitive": { "branch": "master", "commit": "593f831d6f6d779cbabb70a4d1e6b1b1936a88af" },
+  "zenbones.nvim": { "branch": "main", "commit": "510819be60a7e470f244488bc705c1fbcd88c4fc" }
 }
diff --git a/lua/custom/lsp/config.lua b/lua/custom/lsp/config.lua
index f428d85..6fcbdde 100644
--- a/lua/custom/lsp/config.lua
+++ b/lua/custom/lsp/config.lua
@@ -1,16 +1,4 @@
 local lsp_zero = require("lsp-zero")
-local lspconfig = require("lspconfig")
-
-local servers = {}
--- Autoload LSPs from ./config/*.lua files
-for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/custom/lsp/config/*.lua", true)) do
-	local lua_path = ft_path:gsub(".*/lua/(.+)%.lua", "%1")
-	local module_path = lua_path:gsub('/', '.')
-	local config = require(module_path)
-	local name = module_path:match("%.([^%.]+)$")
-	lspconfig[name].setup(config)
-	table.insert(servers, name)
-end
 
 -- Configure Vim diagnostic
 vim.diagnostic.config({
@@ -52,13 +40,3 @@ lsp_zero.on_attach(function(_, bufnr)
 	vim.keymap.set("n", "<leader>D", function() vim.lsp.buf.type_definition() end, opts)
 	vim.keymap.set("n", "<leader><leader>", function() vim.lsp.buf.format() end, opts)
 end)
-
--- Mason configuration
-local ensure_installed = { "rust_analyzer", "zls" }
-require("mason-lspconfig").setup({
-	automatic_installation = true,
-	handlers = {
-		lsp_zero.default_setup,
-	},
-	ensure_installed = vim.list_extend(ensure_installed, servers),
-})
diff --git a/lua/custom/plugins/avante.lua b/lua/custom/plugins/avante.lua
index 0dcf4dd..67b90af 100644
--- a/lua/custom/plugins/avante.lua
+++ b/lua/custom/plugins/avante.lua
@@ -3,14 +3,17 @@ return {
 	lazy = false,
 	priority = 10,
 	opts = {
-		provider = "openai",
-		openai = {
-			endpoint = "https://api.openai.com/v1",
-			model = "gpt-4o",
-			timeout = 30000,
-			temperature = 0,
-			max_tokens = 8192,
-			--reasoning_effort = "medium", -- low|medium|high
+		providers = {
+			openai = {
+				endpoint = "https://api.openai.com/v1",
+				model = "gpt-4o",
+				timeout = 30000,
+				extra_request_body = {
+					temperature = 0,
+				},
+				max_tokens = 8192,
+				--reasoning_effort = "medium", -- low|medium|high
+			},
 		},
 		hints = { enabled = false },
 		mappings = {
@@ -40,7 +43,7 @@ return {
 				border = "rounded",
 				start_insert = true,
 			},
-		}
+		},
 	},
 	build = "make",
 	dependencies = {
diff --git a/lua/custom/plugins/mason-lspconfig.lua b/lua/custom/plugins/mason-lspconfig.lua
new file mode 100644
index 0000000..5c4e4f5
--- /dev/null
+++ b/lua/custom/plugins/mason-lspconfig.lua
@@ -0,0 +1,36 @@
+return {
+	"mason-org/mason-lspconfig.nvim",
+	opts = {},
+	config = function(_, opts)
+		local lsp_zero = require("lsp-zero")
+		local lspconfig = require("lspconfig")
+
+		-- Autoload LSPs from ./config/*.lua files
+		local servers = {}
+		for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/custom/lsp/config/*.lua", true)) do
+			local lua_path = ft_path:gsub(".*/lua/(.+)%.lua", "%1")
+			local module_path = lua_path:gsub('/', '.')
+			local config = require(module_path)
+			local name = module_path:match("%.([^%.]+)$")
+			lspconfig[name].setup(config)
+			table.insert(servers, name)
+		end
+
+		local ensure_installed = { "rust_analyzer", "zls" }
+		ensure_installed = vim.list_extend(ensure_installed, servers)
+		local automatic_installation = true
+		local handlers = {
+			lsp_zero.default_setup,
+		}
+
+		return {
+			ensure_installed,
+			automatic_installation,
+			handlers,
+		}
+	end,
+	dependencies = {
+		{ "mason-org/mason.nvim", opts = {} },
+		"neovim/nvim-lspconfig",
+	},
+}