diff --git a/lua/data/func.lua b/lua/data/func.lua
index a37862a..feb69d2 100644
--- a/lua/data/func.lua
+++ b/lua/data/func.lua
@@ -1245,9 +1245,12 @@ function M.mc_statusline()
       status.color = "lualine_a_normal"
     end
   end
+
+  -- Add the icon and text to the status object
   status.icon_short_text = status.icon .. status.short_text
   status.icon_text = status.icon .. status.text
 
+  -- Update the status object
   if status.cursors > 1 and status.disabled > 0 then
     status.count = status.cursors .. "/" .. status.disabled
   elseif status.cursors > 1 and status.disabled <= 0 then
@@ -1482,6 +1485,7 @@ function M.setup_replace_ellipsis(enable)
   vim.api.nvim_create_augroup("EllipsisReplace", { clear = true })
 
   if enable then
+    -- Add an autocmd to handle the InsertLeave event
     vim.api.nvim_create_autocmd("InsertLeave", {
       group = "EllipsisReplace",
       callback = M.replace_ellipsis,
diff --git a/lua/data/keys.lua b/lua/data/keys.lua
index 9868e66..5bcb8d9 100644
--- a/lua/data/keys.lua
+++ b/lua/data/keys.lua
@@ -13,7 +13,7 @@ local rootiest = require("config.rootiest")
 
 M.alternate = {
   { -- Toggle Alternate
-    "<leader>a",
+    "<leader>A",
     "<cmd>Alternate<cr>",
     desc = "Toggle Alternate",
   },
@@ -535,6 +535,13 @@ M.gp = {
 }
 
 M.group = {
+  avante = {
+    { -- Avante
+      lhs = "<leader>a",
+      icon = { icon = "", color = "red" },
+      group = "Avante",
+    },
+  },
   chatgpt = { -- ChatGPT
     lhs = "<leader>cx",
     group = "ChatGPT",
@@ -804,7 +811,7 @@ M.lazygit = {
     end,
     desc = "LazyGit",
   },
-    { -- LazyGit
+  { -- LazyGit
     "<leader>gg",
     function()
       require("data.func").open_lazygit_popup()
@@ -906,7 +913,7 @@ M.misc = {
   { -- Telescope Find Files
     lhs = "<leader><leader>",
     rhs = function()
-      LazyVim.pick("find_files")()
+      LazyVim.pick("files")()
     end,
     desc = "Find Files",
   },
diff --git a/lua/plugins/ai.lua b/lua/plugins/ai.lua
index 27b62f1..adcfe8f 100644
--- a/lua/plugins/ai.lua
+++ b/lua/plugins/ai.lua
@@ -54,5 +54,11 @@ return {
     opts = data.types.avante,
     build = "make",
     dependencies = data.deps.avante,
+    keys = function()
+      -- Add keymaps for Avante group
+      for _, item in ipairs(data.keys.group.avante) do
+        data.func.add_keymap(item)
+      end
+    end,
   },
 }
diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua
index 69413d6..ff50bcd 100644
--- a/lua/plugins/editor.lua
+++ b/lua/plugins/editor.lua
@@ -27,6 +27,9 @@ return {
   { -- Navic
     import = "lazyvim.plugins.extras.editor.navic",
   },
+  { -- Refactoring
+    import = "lazyvim.plugins.extras.editor.refactoring",
+  },
   { -- Trouble
     "folke/trouble.nvim",
     cmd = data.cmd.trouble,
@@ -37,7 +40,7 @@ return {
     opts = data.types.flash,
     keys = data.keys.flash,
   },
-  {
+  { -- NeoTree
     "nvim-neo-tree/neo-tree.nvim",
     opts = data.types.neotree.opts,
   },
@@ -145,9 +148,9 @@ return {
     end,
     keys = data.keys.undotree,
   },
-  { -- NumberToggle
-    "sitiom/nvim-numbertoggle",
-  },
+  -- { -- NumberToggle
+  --   "sitiom/nvim-numbertoggle",
+  -- },
   { -- Noice
     "folke/noice.nvim",
     optional = true,
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 2624e56..3c9ba98 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -7,19 +7,6 @@
 local data = require("data")
 
 local P = { -- Define Telescope Plugins Specs
-  { -- Telescope Cmdline
-    "nvim-telescope/telescope.nvim",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "jonarrien/telescope-cmdline.nvim",
-    },
-    keys = data.keys.telescope.cmdline,
-    opts = data.types.telescope.cmdline,
-    config = function(_, opts)
-      require("telescope").setup(opts)
-      require("telescope").load_extension("cmdline")
-    end,
-  },
   { -- Telescope All Recent
     "prochri/telescope-all-recent.nvim",
     dependencies = {
@@ -178,6 +165,19 @@ local P = { -- Define Telescope Plugins Specs
       "sindrets/diffview.nvim",
     },
   },
+  { -- Fzf Lua
+    "ibhagwan/fzf-lua",
+    opts = {},
+  },
 }
 
+if require("data.func").check_global_var("use_telescope", false, true) then
+  P = { { import = "lazyvim.plugins.extras.editor.fzf" } }
+end
+
+if require("data.func").check_global_var("use_fzf_lua", true, false) then
+  table.insert(P, 1, { import = "lazyvim.plugins.extras.editor.fzf" })
+  table.insert(P, 2, { "ibhagwan/fzf-lua", lazy = false, opts = {} })
+end
+
 return P