diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index c0feb2d9..c03c971b 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -64,6 +64,11 @@ map("n", "<a-l>", "$", { desc = "Last character of Line" })
 -- Copy whole text to clipboard
 map("n", "<C-c>", ":%y+<CR>", { desc = "Copy whole text to clipboard", silent = true })
 
+-- Motion
+map("c", "<C-a>", "<C-b>", { desc = "Start Of Line" })
+map("i", "<C-a>", "<Home>", { desc = "Start Of Line" })
+map("i", "<C-e>", "<End>", { desc = "End Of Line" })
+
 -- Select all text
 map("n", "<C-a>", "gg<S-V>G", { desc = "Select all text", silent = true, noremap = true })
 
@@ -71,6 +76,10 @@ map("n", "<C-a>", "gg<S-V>G", { desc = "Select all text", silent = true, noremap
 map("i", "<C-v>", '<C-r>"', { desc = "Paste on insert mode" })
 map("v", "p", '"_dP', { desc = "Paste without overwriting" })
 
+-- Delete and change without yanking
+map({ "n", "x" }, "<A-d>", '"_d', { desc = "Delete without yanking" })
+map({ "n", "x" }, "<A-c>", '"_c', { desc = "Change without yanking" })
+
 -- Deleting without yanking empty line
 map("n", "dd", function()
   local is_empty_line = vim.api.nvim_get_current_line():match("^%s*$")
@@ -162,12 +171,4 @@ if package.loaded["cinnamon"] then
   map({ "n", "x" }, "l", "<Cmd>lua Scroll('l', 0, 1)<CR>")
   map({ "n", "x" }, "<Left>", "<Cmd>lua Scroll('h', 0, 1)<CR>")
   map({ "n", "x" }, "<Right>", "<Cmd>lua Scroll('l', 0, 1)<CR>")
-
-  -- LSP_KEYMAPS:
-
-  -- LSP go-to-definition:
-  map("n", "gd", "<Cmd>lua Scroll('definition')<CR>")
-
-  -- LSP go-to-declaration:
-  map("n", "gD", "<Cmd>lua Scroll('declaration')<CR>")
 end
diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua
index 305d80b5..6f880529 100644
--- a/.config/nvim/lua/plugins/bufferline.lua
+++ b/.config/nvim/lua/plugins/bufferline.lua
@@ -3,6 +3,9 @@ return {
   keys = {
     { "[B", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer prev" },
     { "]B", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer next" },
+    { "<leader>.", "<Cmd>BufferLinePick<CR>", desc = "Pick Buffer" },
+    { "<leader>bS", "<Cmd>BufferLineSortByDirectory<CR>", desc = "Sort By Directory" },
+    { "<leader>bs", "<Cmd>BufferLineSortByExtension<CR>", desc = "Sort By Extensions" },
     { "<leader>b1", "<cmd>BufferLineGoToBuffer 1<cr>", desc = "Buffer 1" },
     { "<leader>b2", "<cmd>BufferLineGoToBuffer 2<cr>", desc = "Buffer 2" },
     { "<leader>b3", "<cmd>BufferLineGoToBuffer 3<cr>", desc = "Buffer 3" },
diff --git a/.config/nvim/lua/plugins/dashboard.lua b/.config/nvim/lua/plugins/dashboard.lua
index de3974ee..3a153fb2 100644
--- a/.config/nvim/lua/plugins/dashboard.lua
+++ b/.config/nvim/lua/plugins/dashboard.lua
@@ -18,4 +18,7 @@ return {
     opts.config.header = vim.split(logo, "\n")
     return opts
   end,
+  keys = {
+    { "<leader>fd", "<cmd>Dash<cr>", desc = "Dashboard" },
+  },
 }
diff --git a/.config/nvim/lua/plugins/extras/editor/oil.lua b/.config/nvim/lua/plugins/extras/editor/oil.lua
index 936a1997..355eeef0 100644
--- a/.config/nvim/lua/plugins/extras/editor/oil.lua
+++ b/.config/nvim/lua/plugins/extras/editor/oil.lua
@@ -9,6 +9,6 @@ return {
   },
   -- stylua: ignore
   keys = {
-    { "<leader>;", function() require("oil").toggle_float() end, desc = "Toggle oil" },
+    { "<leader><bs>", function() require("oil").toggle_float() end, desc = "Toggle oil" },
   },
 }