diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua
index c3eaf8a..57f27ad 100644
--- a/lua/taken/core/remaps.lua
+++ b/lua/taken/core/remaps.lua
@@ -1,6 +1,5 @@
 local set = vim.keymap.set
 
-set("n", "<leader><CR>", "<cmd>FineCmdline<CR>", { noremap = true })
 set("v", "J", ":m '>+1<CR>gv=gv")
 set("v", "K", ":m '<-2<CR>gv=gv")
 
@@ -19,12 +18,6 @@ set("n", "Q", "<nop>")
 -- buffer
 set("n", "<leader>bf", vim.lsp.buf.format, { desc = "Formate buffer" })
 set("n", "<leader>bs", ":write <CR>", { desc = "Save buffer" })
-set("n", "<leader>bt", ":ToggleTerm direction=float <CR>", { desc = "Open terminal" })
-set("n", "<leader>bT", ":ToggleTerm direction=horizontal <CR>", { desc = "Open horizontal terminal split" })
-set("n", "<leader><Tab>", ":BufferLineCycleNext <CR>", { desc = "Cycle tabs" })
-set("n", "<leader>bn", ":BufferLineCycleNext <CR>", { desc = "Next tab" })
-set("n", "<leader>bp", ":BufferLineCyclePrev <CR>", { desc = "NextPrevious tab" })
-
 set("n", "<C-k>", "<cmd>cnext<CR>zz")
 set("n", "<C-j>", "<cmd>cprev<CR>zz")
 set("n", "<leader>k", "<cmd>lnext<CR>zz")
@@ -45,17 +38,6 @@ set("n", "<leader>ht", function()
     require("taken.functions.themes").themeselector()
 end, { desc = "Theme selector" })
 
--- telescope
-set("n", "<leader>ff", "<cmd>Telescope find_files<CR>", { desc = "Find files" })
-set("n", "<leader>fg", "<cmd>Telescope live_grep<CR>", { desc = "Live grep" })
-set("n", "<leader>fb", "<cmd>Telescope buffers<CR>", { desc = "Find buffers" })
-set("n", "<leader>fB", "<cmd>Telescope builtin<CR>", { desc = "Find buffers" })
-set("n", "<leader>fh", "<cmd>Telescope help_tags<CR>", { desc = "Help tags" })
-set("n", "<leader>fp", "<cmd>Telescope project<CR>", { desc = "Find projects" })
-set("n", "<leader>fd", "<cmd>Telescope file_browser<CR>", { desc = "File browser" })
-set("n", "<leader>fr", "<cmd>Telescope reloader<CR>", { desc = "Reload config" })
-set("n", "<leader>fc", "<cmd>Telescope commands<CR>", { desc = "Commands" })
-
 -- window movement
 set("n", "<leader>ww", "<C-w>w", { desc = "Move between splits" })
 set("n", "<leader>wc", "<C-w>c", { desc = "Close split" })
@@ -64,24 +46,3 @@ set("n", "<leader>ws", "<C-w>s", { desc = "Horizontal split" })
 
 -- lazy
 set("n", "<leader>lu", "<cmd>Lazy<CR>", { desc = "Lazy UI" })
-
--- nvim-tree
-set("n", "<leader>n", "<cmd>Neotree toggle<CR>")
-set("n", "<leader>e", "<cmd>Neotree focus<CR>")
-
--- maximizer
-set("n", "<leader>tf", "<cmd>MaximizerToggle <CR>", { desc = "Toggle maximizer" })
-
--- trouble
-set("n", "<leader>tt", "<cmd>TroubleToggle <CR>", { silent = true })
-
--- dap
-set("n", "<leader>tb", "<cmd>DapToggleBreakpoint<CR>", { silent = true })
-set("n", "<leader>tc", "<cmd>DapContinue<CR>", { silent = true })
-
--- set("n", "<leader>n", ":NvimTreeToggle <CR>")
--- set("n", "<leader>e", ":NvimTreeFocus <CR>")
--- set("n", "<leader>r", ":NvimTreeRefresh <CR>")
--- set("n", "<leader>tr", function()
---     require("nvim-tree.api").tree.change_root(vim.fn.getcwd())
--- end, { desc = "Change root dir to current dir" })
diff --git a/lua/taken/plugins/bufferline.lua b/lua/taken/plugins/bufferline.lua
index ac8ea3a..7c44379 100644
--- a/lua/taken/plugins/bufferline.lua
+++ b/lua/taken/plugins/bufferline.lua
@@ -3,6 +3,10 @@ return {
     version = "*",
     dependencies = "nvim-tree/nvim-web-devicons",
     config = function()
+        vim.keymap.set("n", "<leader><Tab>", ":BufferLineCycleNext <CR>", { desc = "Cycle tabs" })
+        vim.keymap.set("n", "<leader>bn", ":BufferLineCycleNext <CR>", { desc = "Next tab" })
+        vim.keymap.set("n", "<leader>bp", ":BufferLineCyclePrev <CR>", { desc = "NextPrevious tab" })
+
         local bufferline = require("bufferline")
 
         bufferline.setup({
diff --git a/lua/taken/plugins/cmdline.lua b/lua/taken/plugins/cmdline.lua
index fbe5976..70ed595 100644
--- a/lua/taken/plugins/cmdline.lua
+++ b/lua/taken/plugins/cmdline.lua
@@ -3,6 +3,8 @@ return {
     dependencies = "MunifTanjim/nui.nvim",
     cmd = "FineCmdline",
     config = function()
+        vim.keymap.set("n", "<leader><CR>", "<cmd>FineCmdline<CR>", { noremap = true })
+
         local cmdline = require("fine-cmdline")
 
         cmdline.setup({
diff --git a/lua/taken/plugins/dap.lua b/lua/taken/plugins/dap.lua
index 44e503d..357a902 100644
--- a/lua/taken/plugins/dap.lua
+++ b/lua/taken/plugins/dap.lua
@@ -2,6 +2,9 @@ return {
     "rcarriga/nvim-dap-ui",
     dependencies = "mfussenegger/nvim-dap",
     config = function()
+        vim.keymap.set("n", "<leader>tb", "<cmd>DapToggleBreakpoint<CR>", { silent = true })
+        vim.keymap.set("n", "<leader>tc", "<cmd>DapContinue<CR>", { silent = true })
+
         local dap = require("dap")
         local dapui = require("dapui")
 
diff --git a/lua/taken/plugins/neotree.lua b/lua/taken/plugins/neotree.lua
index d3461df..182322c 100644
--- a/lua/taken/plugins/neotree.lua
+++ b/lua/taken/plugins/neotree.lua
@@ -7,6 +7,9 @@ return {
         "MunifTanjim/nui.nvim",
     },
     config = function()
+        vim.keymap.set("n", "<leader>n", "<cmd>Neotree toggle<CR>")
+        vim.keymap.set("n", "<leader>e", "<cmd>Neotree focus<CR>")
+
         local neotree = require("neo-tree")
 
         neotree.setup({
diff --git a/lua/taken/plugins/nvimtree.lua b/lua/taken/plugins/nvimtree.lua
index 41e3429..e68d9e7 100644
--- a/lua/taken/plugins/nvimtree.lua
+++ b/lua/taken/plugins/nvimtree.lua
@@ -25,6 +25,13 @@ return {
             },
         })
 
+        vim.keymap.set("n", "<leader>n", ":NvimTreeToggle <CR>")
+        vim.keymap.set("n", "<leader>e", ":NvimTreeFocus <CR>")
+        vim.keymap.set("n", "<leader>r", ":NvimTreeRefresh <CR>")
+        vim.keymap.set("n", "<leader>tr", function()
+            require("nvim-tree.api").tree.change_root(vim.fn.getcwd())
+        end, { desc = "Change root dir to current dir" })
+
         local autocmd = vim.api.nvim_create_autocmd
         local augroup = vim.api.nvim_create_augroup
         local neogitCmds = augroup("MyCustomNeogitEvents", { clear = true })
diff --git a/lua/taken/plugins/otherplugins.lua b/lua/taken/plugins/otherplugins.lua
index f382256..0131fbf 100644
--- a/lua/taken/plugins/otherplugins.lua
+++ b/lua/taken/plugins/otherplugins.lua
@@ -8,6 +8,16 @@ return {
     {
         "folke/trouble.nvim",
         dependencies = { "nvim-tree/nvim-web-devicons" },
+        keys = {
+            { "<leader>tt", "<cmd>TroubleToggle <CR>", desc = "Toggle trouble" },
+        },
+    },
+    {
+        "mbbill/undotree",
+        cmd = "UndotreeToggle",
+        keys = {
+            { "<leader>tu", "<cmd>UndotreeToggle", desc = "Toggle undotree" },
+        },
     },
     {
         "sindrets/diffview.nvim",
@@ -26,6 +36,9 @@ return {
     {
         "szw/vim-maximizer",
         cmd = "MaximizerToggle",
+        keys = {
+            { "<leader>tf", "<cmd>MaximizerToggle <CR>", desc = "Toggle maximizer" },
+        },
     },
     {
         "NvChad/nvim-colorizer.lua",
@@ -48,9 +61,11 @@ return {
             let g:mkdp_auto_close = 0
             let g:mkdp_theme = 'dark'
             ]])
-            vim.keymap.set("n", "<leader>bm", "<cmd>MarkdownPreviewToggle <CR>", { desc = "Toggle markdown preview" })
         end,
         ft = "markdown",
+        keys = {
+            { "<leader>bm", "<cmd>MarkdownPreviewToggle <CR>", desc = "Toggle markdown preview" },
+        },
     },
     {
         "f-person/git-blame.nvim",
diff --git a/lua/taken/plugins/telescope.lua b/lua/taken/plugins/telescope.lua
index de88fe3..315e6e5 100644
--- a/lua/taken/plugins/telescope.lua
+++ b/lua/taken/plugins/telescope.lua
@@ -27,15 +27,25 @@ return {
                     },
                 },
                 fzf = {
-                    fuzzy = true, -- false will only do exact matching
+                    fuzzy = true,                   -- false will only do exact matching
                     override_generic_sorter = true, -- override the generic sorter
-                    override_file_sorter = true, -- override the file sorter
-                    case_mode = "smart_case", -- or "ignore_case" or "respect_case"
+                    override_file_sorter = true,    -- override the file sorter
+                    case_mode = "smart_case",       -- or "ignore_case" or "respect_case"
                 },
             },
         })
 
         telescope.load_extension("file_browser")
         telescope.load_extension("fzf")
+
+        vim.keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<CR>", { desc = "Find files" })
+        vim.keymap.set("n", "<leader>fg", "<cmd>Telescope live_grep<CR>", { desc = "Live grep" })
+        vim.keymap.set("n", "<leader>fb", "<cmd>Telescope buffers<CR>", { desc = "Find buffers" })
+        vim.keymap.set("n", "<leader>fB", "<cmd>Telescope builtin<CR>", { desc = "Find buffers" })
+        vim.keymap.set("n", "<leader>fh", "<cmd>Telescope help_tags<CR>", { desc = "Help tags" })
+        vim.keymap.set("n", "<leader>fp", "<cmd>Telescope project<CR>", { desc = "Find projects" })
+        vim.keymap.set("n", "<leader>fd", "<cmd>Telescope file_browser<CR>", { desc = "File browser" })
+        vim.keymap.set("n", "<leader>fr", "<cmd>Telescope reloader<CR>", { desc = "Reload config" })
+        vim.keymap.set("n", "<leader>fc", "<cmd>Telescope commands<CR>", { desc = "Commands" })
     end,
 }
diff --git a/lua/taken/plugins/toggleterm.lua b/lua/taken/plugins/toggleterm.lua
index fa8bd87..aca849a 100644
--- a/lua/taken/plugins/toggleterm.lua
+++ b/lua/taken/plugins/toggleterm.lua
@@ -8,5 +8,12 @@ return {
             shell = "pwsh.exe -nologo",
             start_in_insert = true,
         })
+        vim.keymap.set("n", "<leader>bt", ":ToggleTerm direction=float <CR>", { desc = "Open terminal" })
+        vim.keymap.set(
+            "n",
+            "<leader>bT",
+            ":ToggleTerm direction=horizontal <CR>",
+            { desc = "Open horizontal terminal split" }
+        )
     end,
 }