diff --git a/lua/core/diagnostics.lua b/lua/core/diagnostics.lua
index 1fc25771..e144db17 100644
--- a/lua/core/diagnostics.lua
+++ b/lua/core/diagnostics.lua
@@ -14,4 +14,4 @@ vim.diagnostic.config {
   jump = { float = true },
 }
 
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
+vim.keymap.set('n', '<leader>dq', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
index c5de64e7..20ffa9fb 100644
--- a/lua/core/keymaps.lua
+++ b/lua/core/keymaps.lua
@@ -33,3 +33,28 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
 -- vim.keymap.set("n", "<C-S-l>", "<C-w>L", { desc = "Move window to the right" })
 -- vim.keymap.set("n", "<C-S-j>", "<C-w>J", { desc = "Move window to the lower" })
 -- vim.keymap.set("n", "<C-S-k>", "<C-w>K", { desc = "Move window to the upper" })
+
+vim.keymap.set('n', 'n', 'nzz')
+vim.keymap.set('n', 'N', 'Nzz')
+vim.keymap.set('n', '*', '*zz')
+vim.keymap.set('n', '#', '#zz')
+-- vim.keymap.set('n', 'g*', '*zz')
+-- vim.keymap.set('n', 'g#', '#zz')
+vim.keymap.set('n', '{', '{zt')
+vim.keymap.set('n', '}', '}zt')
+vim.keymap.set('n', '(', '(zt')
+vim.keymap.set('n', ')', ')zt')
+
+vim.keymap.set('n', '<leader>tl', '<cmd>Lazy<CR>', { desc = '[T]oggle [L]azy' })
+vim.keymap.set('n', '<leader>tm', '<cmd>Mason<CR>', { desc = '[T]oggle [M]ason' })
+vim.keymap.set('n', '<leader>ta', '<cmd>set arabic!<CR>', { desc = '[T]oggle [A]rabic' })
+vim.keymap.set('n', '<leader>tw', '<cmd>set wrap!<CR>', { noremap = true, silent = true, desc = '[T]oggle [W]rap' })
+
+vim.keymap.set('n', '<leader>w', '<cmd>w<CR>', { desc = '[w]rite buffer' })
+vim.keymap.set('n', '<leader>y', '<cmd>%y<CR>', { desc = '[y]ank buffer' })
+vim.keymap.set('n', '<leader>q', '<cmd>q<CR>', { desc = '[q]uit buffer' })
+vim.keymap.set('n', '<leader>c', '<cmd>bdelete<CR>', { desc = '[c]lose file' })
+
+-- Add a keymap for delete while on insert-mode
+-- this works well with <C-h>, <C-w>, <C-u>
+vim.keymap.set('i', '<C-f>', '<Del>')
diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua
index 0bde4fb8..809d7137 100644
--- a/lua/plugins/which-key.lua
+++ b/lua/plugins/which-key.lua
@@ -14,6 +14,7 @@ return {
     spec = {
       { '<leader>s', group = '[S]earch', mode = { 'n', 'v' } },
       { '<leader>t', group = '[T]oggle' },
+      { '<leader>d', group = '[D]iangostic' },
       { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
       { 'gr', group = 'LSP Actions', mode = { 'n' } },
     },