diff --git a/lazy-lock.json b/lazy-lock.json
index 0c48b67..b1cca03 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,16 +1,20 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "arrow.nvim": { "branch": "master", "commit": "6e0f726f55f99332dd726a53effd6813786b6d49" },
+  "avante.nvim": { "branch": "main", "commit": "164a86db6e5da78bc42310691a26b22d0763ceca" },
   "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
   "blink-ripgrep.nvim": { "branch": "main", "commit": "8aa4393ad2d0e83b74de2798a26589826a5436ce" },
   "blink.cmp": { "branch": "main", "commit": "485c03400608cb6534bbf84da8c1c471fc4808c0" },
   "colorful-menu.nvim": { "branch": "master", "commit": "d5b97d247528be308b6b69d96b5950a30e470f3d" },
   "copilot.lua": { "branch": "master", "commit": "3123983d00ae6859f8bc987d14ebb524bb41b618" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
   "flash.nvim": { "branch": "main", "commit": "3be9bf7e85550045ec576379a0c45aac144d0438" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
-  "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
+  "gruvbox": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
+  "img-clip.nvim": { "branch": "main", "commit": "e7e29f0d07110405adecd576b602306a7edd507a" },
+  "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" },
   "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9" },
   "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
@@ -22,7 +26,9 @@
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "render-markdown.nvim": { "branch": "main", "commit": "bfd67f1402b97ac619cb538f4bbaed12a7fa89aa" },
   "solarized.nvim": { "branch": "main", "commit": "c0dfe1cbfabd93b546baf5f1408f5df7e02e2050" },
+  "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
   "tokyonight": { "branch": "main", "commit": "fd6c11a32ca79ca610fd54aadb513b5a6fce9858" },
   "vesper": { "branch": "main", "commit": "1717b1ad657c94bec3fc2bdebb0c55452d9fe46d" },
diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua
new file mode 100644
index 0000000..9d937e1
--- /dev/null
+++ b/lua/plugins/avante.lua
@@ -0,0 +1,101 @@
+return {
+  "yetone/avante.nvim",
+  event = "VeryLazy",
+  lazy = false,
+  version = false,
+  opts = {
+    provider = "claude",
+    auto_suggestions_provider = "claude",
+    providers = {
+      claude = {
+        endpoint = "https://api.anthropic.com/v1",
+        model = "claude-sonnet-4-20250514",
+        extra_request_body = {
+          temperature = 0,
+          max_tokens = 4096,
+        },
+      },
+    },
+    behaviour = {
+      auto_suggestions = false,
+      auto_set_highlight_group = true,
+      auto_set_keymaps = true,
+      auto_apply_diff_after_generation = false,
+      support_paste_from_clipboard = false,
+    },
+    mappings = {
+      diff = {
+        ours = "co",
+        theirs = "ct",
+        all_theirs = "ca",
+        both = "cb",
+        cursor = "cc",
+        next = "]x",
+        prev = "[x",
+      },
+      suggestion = {
+        accept = "<M-l>",
+        next = "<M-]>",
+        prev = "<M-[>",
+        dismiss = "<C-]>",
+      },
+      jump = {
+        next = "]]",
+        prev = "[[",
+      },
+      submit = {
+        normal = "<CR>",
+        insert = "<C-s>",
+      },
+    },
+    hints = { enabled = true },
+    windows = {
+      position = "right",
+      wrap = true,
+      width = 30,
+      sidebar_header = {
+        align = "center",
+        rounded = true,
+      },
+    },
+    highlights = {
+      diff = {
+        current = "DiffText",
+        incoming = "DiffAdd",
+      },
+    },
+    diff = {
+      autojump = true,
+      list_opener = "copen",
+    },
+  },
+  build = "make",
+  dependencies = {
+    "nvim-treesitter/nvim-treesitter",
+    "stevearc/dressing.nvim",
+    "nvim-lua/plenary.nvim",
+    "MunifTanjim/nui.nvim",
+    "nvim-tree/nvim-web-devicons",
+    {
+      "HakonHarnes/img-clip.nvim",
+      event = "VeryLazy",
+      opts = {
+        default = {
+          embed_image_as_base64 = false,
+          prompt_for_file_name = false,
+          drag_and_drop = {
+            insert_mode = true,
+          },
+          use_absolute_path = true,
+        },
+      },
+    },
+    {
+      "MeanderingProgrammer/render-markdown.nvim",
+      opts = {
+        file_types = { "markdown", "Avante" },
+      },
+      ft = { "markdown", "Avante" },
+    },
+  },
+}
diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua
index 6782f12..8af2482 100644
--- a/lua/plugins/blink.lua
+++ b/lua/plugins/blink.lua
@@ -15,7 +15,17 @@ return {
     
     return {
       keymap = {
-        preset = "super-tab",
+        preset = "enter",  -- Changed from "super-tab" to "enter"
+        ['<C-space>'] = { 'show', 'show_documentation', 'hide_documentation' },
+        ['<C-e>'] = { 'hide' },
+        ['<C-y>'] = { 'select_and_accept' },
+
+        ['<C-p>'] = { 'select_prev', 'fallback' },
+        ['<C-n>'] = { 'select_next', 'fallback' },
+
+        ['<C-b>'] = { 'scroll_documentation_up', 'fallback' },
+        ['<C-f>'] = { 'scroll_documentation_down', 'fallback' },
+
         ['<A-1>'] = { function(cmp) cmp.accept({ index = 1 }) end },
         ['<A-2>'] = { function(cmp) cmp.accept({ index = 2 }) end },
         ['<A-3>'] = { function(cmp) cmp.accept({ index = 3 }) end },
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index d793386..3f3cca8 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -1,4 +1,16 @@
 return {
+  {
+    "ellisonleao/gruvbox.nvim",
+    name = "gruvbox",
+    priority = 1000,
+    lazy = false,
+    config = function()
+      require("gruvbox").setup({
+        contrast = "hard", -- can be "hard", "soft" or empty string
+        transparent_mode = false,
+      })
+    end,
+  },
   {
     "datsfilipe/vesper.nvim",
     name = "vesper",
@@ -41,10 +53,9 @@ return {
           end
         end
         
-        -- Default to dark
+        -- Default to dark with Gruvbox
         vim.o.background = "dark"
-        require("vesper").setup({ transparent = true })
-        vim.cmd.colorscheme("vesper")
+        vim.cmd.colorscheme("gruvbox")
       end
       
       -- Set theme on startup
@@ -52,15 +63,14 @@ return {
       
       -- Add command to manually toggle
       vim.api.nvim_create_user_command("ToggleTheme", function()
-        if vim.g.colors_name == "vesper" then
+        if vim.g.colors_name == "gruvbox" then
           vim.o.termguicolors = true
           vim.o.background = "light"
           require('solarized').setup({})
           vim.cmd.colorscheme("solarized")
         else
           vim.o.background = "dark"
-          require("vesper").setup({ transparent = true })
-          vim.cmd.colorscheme("vesper")
+          vim.cmd.colorscheme("gruvbox")
         end
       end, {})
     end,
diff --git a/lua/plugins/supermaven.lua b/lua/plugins/supermaven.lua
new file mode 100644
index 0000000..4b6c1c6
--- /dev/null
+++ b/lua/plugins/supermaven.lua
@@ -0,0 +1,19 @@
+return {
+  "supermaven-inc/supermaven-nvim",
+  event = "InsertEnter",
+  opts = {
+    keymaps = {
+      accept_suggestion = "<Tab>",
+      clear_suggestion = "<C-]>",
+      accept_word = "<C-j>",
+    },
+    ignore_filetypes = { "gitcommit", "TelescopePrompt" },
+    color = {
+      suggestion_color = "#808080",
+      cterm = 244,
+    },
+    log_level = "info",
+    disable_inline_completion = false,
+    disable_keymaps = false,
+  },
+}