diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua
index 9ccdfb1..069a7e6 100644
--- a/lua/taken/core/remaps.lua
+++ b/lua/taken/core/remaps.lua
@@ -14,13 +14,7 @@ local M = {
 
         ["Q"] = { "<nop>" },
         ["0"] = { "^", desc = "Go to first non blank character in line" },
-
         ["<leader>0"] = { "0", desc = "Go to true line beggining" },
-        -- buffer
-        ["<C-k>"] = { "<cmd>cnext<CR>zz" },
-        ["<C-j>"] = { "<cmd>cprev<CR>zz" },
-        ["<leader>k"] = { "<cmd>lnext<CR>zz" },
-        ["<leader>j"] = { "<cmd>lprev<CR>zz" },
 
         -- window movement
         ["<leader>ww"] = { "<C-w>w", desc = "Move between splits" },
@@ -40,13 +34,12 @@ local M = {
             desc = "Source current file",
         },
 
-        ["<leader>ht"] = {
+        ["<leader>ot"] = {
             function()
                 require("taken.utils.themes").themeselector()
             end,
             desc = "Theme selector",
         },
-        ["<leader>hc"] = { ":nohl<CR>", desc = "Clear search highlights" },
     },
     vn = {
         ["<leader>+"] = { "<C-a>", desc = "Increment number" },
diff --git a/lua/taken/plugins/cmdline.lua b/lua/taken/plugins/cmdline.lua
deleted file mode 100644
index 770c18f..0000000
--- a/lua/taken/plugins/cmdline.lua
+++ /dev/null
@@ -1,35 +0,0 @@
---- @type LazyPluginSpec
-return {
-    "VonHeikemen/fine-cmdline.nvim",
-    dependencies = "MunifTanjim/nui.nvim",
-    cmd = "FineCmdline",
-    keys = {
-        { "<leader><CR>", "<cmd>FineCmdline<CR>", desc = "Open fine cmdline" },
-    },
-    config = function()
-        local cmdline = require("fine-cmdline")
-
-        cmdline.setup({
-            cmdline = {
-                enable_keymaps = true,
-                smart_history = true,
-                prompt = "> ",
-            },
-            popup = {
-                position = {
-                    row = "10%",
-                    col = "50%",
-                },
-                size = {
-                    width = "80%",
-                },
-                border = {
-                    style = "rounded",
-                },
-                win_options = {
-                    winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
-                },
-            },
-        })
-    end,
-}
diff --git a/lua/taken/plugins/conform.lua b/lua/taken/plugins/conform.lua
index f39d4f9..84944a2 100644
--- a/lua/taken/plugins/conform.lua
+++ b/lua/taken/plugins/conform.lua
@@ -28,7 +28,5 @@ return {
             end
             require("conform").format({ async = true, lsp_format = "fallback", range = range })
         end, { range = true })
-
-        vim.keymap.set("n", "<leader>bf", "<cmd>Format<CR>", { silent = true, desc = "Format buffer" })
     end,
 }
diff --git a/lua/taken/plugins/dap.lua b/lua/taken/plugins/dap.lua
index 5b89337..f2124c5 100644
--- a/lua/taken/plugins/dap.lua
+++ b/lua/taken/plugins/dap.lua
@@ -46,7 +46,11 @@ return {
 
         dapui.setup()
 
-        vim.keymap.set("n", "<leader>tb", "<cmd>DapToggleBreakpoint<CR>", { silent = true, desc = "Toggle breakpoint" })
-        vim.keymap.set("n", "<leader>tc", "<cmd>DapContinue<CR>", { silent = true, desc = "Continue debugger" })
+        vim.keymap.set("n", "<leader>cb", "<cmd>DapToggleBreakpoint<CR>", { silent = true, desc = "Toggle breakpoint" })
+        vim.keymap.set("n", "<leader>cc", "<cmd>DapContinue<CR>", { silent = true, desc = "Continue debugger" })
+        vim.keymap.set("n", "<leader>ci", "<cmd>DapStepInto<CR>", { silent = true, desc = "Step into" })
+        vim.keymap.set("n", "<leader>co", "<cmd>DapStepOver<CR>", { silent = true, desc = "Step over" })
+        vim.keymap.set("n", "<leader>cO", "<cmd>DapStepOut<CR>", { silent = true, desc = "Step out" })
+        vim.keymap.set("n", "<leader>ce", "<cmd>DapEval", { silent = true, desc = "Evaluate expression" })
     end,
 }
diff --git a/lua/taken/plugins/gitsigns.lua b/lua/taken/plugins/gitsigns.lua
index 0634195..0688671 100644
--- a/lua/taken/plugins/gitsigns.lua
+++ b/lua/taken/plugins/gitsigns.lua
@@ -14,15 +14,15 @@ return {
             },
         })
 
-        vim.keymap.set({ "n", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", { silent = true, desc = "Stage hunk" })
-        vim.keymap.set({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", { silent = true, desc = "Reset hunk" })
-        vim.keymap.set("n", "<leader>ghS", gitsigns.stage_buffer, { silent = true, desc = "Stage buffer" })
-        vim.keymap.set("n", "<leader>gha", gitsigns.stage_hunk, { silent = true, desc = "Satage hunk" })
-        vim.keymap.set("n", "<leader>ghu", gitsigns.undo_stage_hunk, { silent = true, desc = "Undo stage hunk" })
-        vim.keymap.set("n", "<leader>ghR", gitsigns.reset_buffer, { silent = true, desc = "Reset buffer" })
-        vim.keymap.set("n", "<leader>ghp", gitsigns.preview_hunk, { silent = true, desc = "Preview hunk" })
-        vim.keymap.set("n", "<leader>ghd", gitsigns.diffthis, { silent = true, desc = "Diff this" })
-        vim.keymap.set("n", "<leader>ghD", function()
+        vim.keymap.set({ "n", "v" }, "ghs", ":Gitsigns stage_hunk<CR>", { silent = true, desc = "Stage hunk" })
+        vim.keymap.set({ "n", "v" }, "ghr", ":Gitsigns reset_hunk<CR>", { silent = true, desc = "Reset hunk" })
+        vim.keymap.set("n", "ghS", gitsigns.stage_buffer, { silent = true, desc = "Stage buffer" })
+        vim.keymap.set("n", "gha", gitsigns.stage_hunk, { silent = true, desc = "Satage hunk" })
+        vim.keymap.set("n", "ghu", gitsigns.undo_stage_hunk, { silent = true, desc = "Undo stage hunk" })
+        vim.keymap.set("n", "ghR", gitsigns.reset_buffer, { silent = true, desc = "Reset buffer" })
+        vim.keymap.set("n", "ghp", gitsigns.preview_hunk, { silent = true, desc = "Preview hunk" })
+        vim.keymap.set("n", "ghd", gitsigns.diffthis, { silent = true, desc = "Diff this" })
+        vim.keymap.set("n", "ghD", function()
             gitsigns.diffthis("~")
         end, { silent = true, desc = "Diff this" })
     end,
diff --git a/lua/taken/plugins/harpoon.lua b/lua/taken/plugins/harpoon.lua
index 6172abb..3e673d7 100644
--- a/lua/taken/plugins/harpoon.lua
+++ b/lua/taken/plugins/harpoon.lua
@@ -18,16 +18,16 @@ return {
             harpoon.ui:toggle_quick_menu(harpoon:list())
         end, { silent = true, desc = "Toggle harpoon quick menu" })
 
-        vim.keymap.set("n", "<leader>a1", function()
+        vim.keymap.set("n", "<leader>1", function()
             harpoon:list():select(1)
         end, { silent = true, desc = "Jumps to item 1 in the list" })
-        vim.keymap.set("n", "<leader>a2", function()
+        vim.keymap.set("n", "<leader>2", function()
             harpoon:list():select(2)
         end, { silent = true, desc = "Jumps to item 2 in the list" })
-        vim.keymap.set("n", "<leader>a3", function()
+        vim.keymap.set("n", "<leader>3", function()
             harpoon:list():select(3)
         end, { silent = true, desc = "Jumps to item 3 in the list" })
-        vim.keymap.set("n", "<leader>a4", function()
+        vim.keymap.set("n", "<leader>4", function()
             harpoon:list():select(4)
         end, { silent = true, desc = "Jumps to item 4 in the list" })
     end,
diff --git a/lua/taken/plugins/nvim-silicon.lua b/lua/taken/plugins/nvim-silicon.lua
index f111070..379646a 100644
--- a/lua/taken/plugins/nvim-silicon.lua
+++ b/lua/taken/plugins/nvim-silicon.lua
@@ -4,7 +4,7 @@ return {
     cmd = "Silicon",
     keys = {
         {
-            "<leader>sc",
+            "<leader>oc",
             ":Silicon<CR>",
             mode = { "v", "n" },
             desc = "Capture code to image",
diff --git a/lua/taken/plugins/whichkey.lua b/lua/taken/plugins/whichkey.lua
index c022d46..29a122f 100644
--- a/lua/taken/plugins/whichkey.lua
+++ b/lua/taken/plugins/whichkey.lua
@@ -40,14 +40,17 @@ return {
             {
                 { "<leader>a", group = "harpoon" },
                 { "<leader>b", group = "buffer" },
-                { "<leader>f", group = "find" },
+                { "<leader>c", group = "debuging" },
+                { "<leader>f", group = "telescope" },
                 { "<leader>g", group = "git" },
-                { "<leader>h", group = "highlights" },
-                { "<leader>l", group = "lazy" },
+                { "<leader>m", group = "treesiter-objects" },
+                { "<leader>o", group = "misc" },
                 { "<leader>p", group = "project" },
+                { "<leader>r", group = "runner" },
                 { "<leader>t", group = "toggle" },
-                { "<leader>x", group = "trouble" },
+                { "<leader>v", group = "lsp" },
                 { "<leader>w", group = "window" },
+                { "<leader>x", group = "trouble" },
             },
         })
     end,