diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua
index b61191c..3b00e56 100644
--- a/config/nvim/lua/mappings.lua
+++ b/config/nvim/lua/mappings.lua
@@ -3,18 +3,45 @@ require "nvchad.mappings"
 -- add yours here
 
 local map = vim.keymap.set
+local nomap = vim.keymap.del
 
-map("i", "jk", "<ESC>")
-map("i", "<C-a>", "<esc>I" )
-map("i", "<C-e>", "<esc>A" )
+nomap("n", "<leader>b")
+nomap("n", "<leader>ch")
+nomap("n", "<leader>cm")
+nomap("n", "<leader>ds")
+nomap("n", "<leader>fh")
+nomap("n", "<leader>fm")
+nomap("n", "<leader>gt")
+nomap("n", "<leader>ma")
+nomap("n", "<leader>pt")
+nomap("n", "<leader>rn")
+nomap("n", "<leader>th")
+nomap("n", "<leader>v")
+nomap("n", "<leader>wK")
+nomap("n", "<leader>wk")
+nomap("n", "<leader>x")
+nomap("n", "<leader>fo")
+nomap("n", "<leader>fz")
 
-map("n", ";", ":", { desc = "CMD enter command mode" })
-map("n", "<esc><cr>", "<esc><cmd>wq!<cr>", { desc = "Save and Exit" })
-map("n", "<leader>m", '<cmd>execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>', { desc = "Toggle Column" })
-map("n", "<leader>h", "<cmd>set hlsearch!<cr>", { desc = "Toggle hlsearch" })
-map("n", "<leader>j", "<cmd>bprevious<cr>", { desc = "Buffer Previous" })
-map("n", "<leader>k", "<cmd>bnext<cr>", { desc = "Buffer Next" })
-map("n", "<leader>n", '<cmd>set number!<cr><cmd>IBLToggle<cr><cmd>execute "set signcolumn=" . (&signcolumn == "yes" ? "no" : "yes")<cr>', { desc = "Toggle Decorations" })
-map("n", "<leader>w", "<cmd>lua require('whitespace-nvim').trim()<cr>", { desc = "Trim Trailing Whitespaces" })
-map("n", "<leader>x", "<cmd>bd<cr>", { desc = "Buffer Close" })
-map("n", "<tab>", "<C-w>w", { desc = "Switch buffer" })
+map("i", "<C-a>", "<esc>I")
+map("i", "<C-e>", "<esc>A")
+
+map("n", "<esc><CR>", "<esc><cmd>wq!<CR>", { desc = "save and exit" })
+map("n", "<leader>b", "", { desc = "buffer operations" })
+map("n", "<leader>bn", "<cmd>enew<CR>", { desc = "new" })
+map("n", "<leader>bj", "<cmd>bprevious<CR>", { desc = "previous" })
+map("n", "<leader>bk", "<cmd>bnext<CR>", { desc = "next" })
+map("n", "<leader>bx", "<cmd>bd<CR>", { desc = "close" })
+map("n", "<leader>e", "<cmd>NvimTreeFocus<CR>", { desc = "file tree" })
+map("n", "<leader>f", "", { desc = "find operations" })
+map("n", "<leader>fa", "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>", { desc = "all files" })
+map("n", "<leader>fb", "<cmd>Telescope buffers<CR>", { desc = "buffers" })
+map("n", "<leader>ff", "<cmd>Telescope find_files<CR>", { desc = "files" })
+map("n", "<leader>fw", "<cmd>Telescope live_grep<CR>", { desc = "grep" })
+map("n", "<leader>h", "<cmd>set hlsearch!<CR>", { desc = "Toggle hlsearch" })
+map("n", "<leader>m", '<cmd>execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<CR>', { desc = "Toggle Column" })
+map("n", "<leader>n", '<cmd>set number!<CR><cmd>IBLToggle<CR><cmd>execute "set signcolumn=" . (&signcolumn == "yes" ? "no" : "yes")<CR>', { desc = "Toggle Decorations" })
+map("n", "<leader>t", function()
+  require("nvchad.themes").open()
+end, { desc = "Change Theme" })
+map("n", "<tab>", "<C-w>w", { desc = "switch pane" })