diff --git a/lua/plugins/aider.lua b/lua/plugins/aider.lua
index 5374857..cf5637a 100644
--- a/lua/plugins/aider.lua
+++ b/lua/plugins/aider.lua
@@ -15,6 +15,50 @@ return {
         -- Example nvim-tree.lua integration if needed
         { '<leader>a+', '<cmd>AiderTreeAddFile<cr>', desc = 'Add File from Tree to Aider', ft = 'NvimTree' },
         { '<leader>a-', '<cmd>AiderTreeDropFile<cr>', desc = 'Drop File from Tree from Aider', ft = 'NvimTree' },
+        -- Open aider with gpt-4.1 as the main model
+        {
+            '<leader>a?',
+            function()
+                require('nvim_aider').setup {
+                    aider_cmd = 'aider',
+                    args = {
+                        '--config=$HOME/.config/aider/aider.yaml',
+                        '--env-file=$(pwd)/.aider.env',
+                        '--model=gpt-4.1',
+                    },
+                    auto_reload = true,
+                    win = {
+                        wo = { winbar = 'Aider (GPT-4.1)' },
+                        style = 'nvim_aider',
+                        position = 'bottom',
+                    },
+                }
+                vim.cmd 'Aider toggle'
+            end,
+            desc = 'Open Aider with GPT-4.1',
+        },
+        {
+            '<leader>ag',
+            function()
+                require('nvim_aider').setup {
+                    aider_cmd = 'aider',
+                    args = {
+                        '--config=$HOME/.config/aider/aider.yaml',
+                        '--env-file=$(pwd)/.aider.env',
+                        '--model=gemini-2.5-pro',
+                        '--architect',
+                    },
+                    auto_reload = true,
+                    win = {
+                        wo = { winbar = 'Aider (Gemini-2.5-Pro)' },
+                        style = 'nvim_aider',
+                        position = 'bottom',
+                    },
+                }
+                vim.cmd 'Aider toggle'
+            end,
+            desc = 'Open Aider with Gemini 2.5 Pro',
+        },
     },
     dependencies = {
         'folke/snacks.nvim',
@@ -43,6 +87,7 @@ return {
             args = {
                 '--config=$HOME/.config/aider/aider.yaml',
                 '--env-file=$(pwd)/.aider.env',
+                '--architect',
             },
             auto_reload = true,
             win = {
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 6c34895..b084be6 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -249,16 +249,6 @@ return {
                 },
             },
 
-            volar = {
-                on_attach = function(client, bufnr)
-                    client.server_capabilities.documentFormattingProvider = false
-                end,
-                capabilities = {
-                    documentFormattingProvider = true,
-                    documentRangeFormattingProvider = true,
-                },
-            },
-
             phpactor = {
                 on_attach = function(client, bufnr)
                     client.server_capabilities.documentFormattingProvider = false