diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua
index 8ae8355..7a15e23 100644
--- a/lua/taken/core/remaps.lua
+++ b/lua/taken/core/remaps.lua
@@ -16,7 +16,6 @@ local M = {
         ["0"] = { "^", desc = "Go to first non blank character in line" },
 
         ["<leader>0"] = { "0", desc = "Go to true line beggining" },
-        ["<leader>q"] = { ":noh<CR>", desc = "Clear highlights" },
         -- buffer
         ["<leader>bs"] = { ":write <CR>", desc = "Save buffer" },
         ["<C-k>"] = { "<cmd>cnext<CR>zz" },
diff --git a/lua/taken/plugins/harpoon.lua b/lua/taken/plugins/harpoon.lua
index 4b680b5..6172abb 100644
--- a/lua/taken/plugins/harpoon.lua
+++ b/lua/taken/plugins/harpoon.lua
@@ -11,23 +11,23 @@ return {
 
         harpoon:setup()
 
-        vim.keymap.set("n", "<leader>a", function()
+        vim.keymap.set("n", "<leader>aa", function()
             harpoon:list():append()
         end, { silent = true, desc = "Append current file to harpoon" })
-        vim.keymap.set("n", "<A-h>", function()
+        vim.keymap.set("n", "<leader>ah", function()
             harpoon.ui:toggle_quick_menu(harpoon:list())
         end, { silent = true, desc = "Toggle harpoon quick menu" })
 
-        vim.keymap.set("n", "<A-1>", function()
+        vim.keymap.set("n", "<leader>a1", function()
             harpoon:list():select(1)
         end, { silent = true, desc = "Jumps to item 1 in the list" })
-        vim.keymap.set("n", "<A-2>", function()
+        vim.keymap.set("n", "<leader>a2", function()
             harpoon:list():select(2)
         end, { silent = true, desc = "Jumps to item 2 in the list" })
-        vim.keymap.set("n", "<A-3>", function()
+        vim.keymap.set("n", "<leader>a3", function()
             harpoon:list():select(3)
         end, { silent = true, desc = "Jumps to item 3 in the list" })
-        vim.keymap.set("n", "<A-4>", function()
+        vim.keymap.set("n", "<leader>a4", function()
             harpoon:list():select(4)
         end, { silent = true, desc = "Jumps to item 4 in the list" })
     end,
diff --git a/lua/taken/plugins/whichkey.lua b/lua/taken/plugins/whichkey.lua
index 2eec149..11605de 100644
--- a/lua/taken/plugins/whichkey.lua
+++ b/lua/taken/plugins/whichkey.lua
@@ -38,6 +38,7 @@ return {
 
         whichkey.add({
             {
+                { "<leader>a", group = "harpoon" },
                 { "<leader>b", group = "buffer" },
                 { "<leader>f", group = "find" },
                 { "<leader>g", group = "git" },
@@ -45,6 +46,7 @@ return {
                 { "<leader>l", group = "lazy" },
                 { "<leader>p", group = "project" },
                 { "<leader>t", group = "toggle" },
+                { "<leader>x", group = "trouble" },
                 { "<leader>w", group = "window" },
             },
         })