diff --git a/lua/taken/plugins/cmdline.lua b/lua/taken/plugins/cmdline.lua
index 70ed595..425d0f4 100644
--- a/lua/taken/plugins/cmdline.lua
+++ b/lua/taken/plugins/cmdline.lua
@@ -2,9 +2,10 @@ return {
     "VonHeikemen/fine-cmdline.nvim",
     dependencies = "MunifTanjim/nui.nvim",
     cmd = "FineCmdline",
+    keys = {
+        { "<leader><CR>", "<cmd>FineCmdline<CR>" },
+    },
     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/toggleterm.lua b/lua/taken/plugins/toggleterm.lua
index aca849a..937cce8 100644
--- a/lua/taken/plugins/toggleterm.lua
+++ b/lua/taken/plugins/toggleterm.lua
@@ -2,18 +2,15 @@ return {
     "akinsho/toggleterm.nvim",
     version = "*",
     cmd = "ToggleTerm",
+    keys = {
+        { "<leader>bt", ":ToggleTerm direction=float <CR>",      desc = "Open terminal" },
+        { "<leader>bT", ":ToggleTerm direction=horizontal <CR>", desc = "Open horizontal terminal split" },
+    },
     config = function()
         local toggleterm = require("toggleterm")
         toggleterm.setup({
             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,
 }