diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index ddff65ac..c77957f5 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -28,15 +28,9 @@ map("n", "-", "<C-x>")
 -- Tabs
 map("n", "]<tab>", "<cmd>tabnext<cr>", { desc = "Next Tab" })
 map("n", "[<tab>", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })
-map("n", "<leader><tab>1", "<cmd>tabn 1<cr>", { desc = "Tab 1" })
-map("n", "<leader><tab>2", "<cmd>tabn 2<cr>", { desc = "Tab 2" })
-map("n", "<leader><tab>3", "<cmd>tabn 3<cr>", { desc = "Tab 3" })
-map("n", "<leader><tab>4", "<cmd>tabn 4<cr>", { desc = "Tab 4" })
-map("n", "<leader><tab>5", "<cmd>tabn 5<cr>", { desc = "Tab 5" })
-map("n", "<leader><tab>6", "<cmd>tabn 6<cr>", { desc = "Tab 6" })
-map("n", "<leader><tab>7", "<cmd>tabn 7<cr>", { desc = "Tab 7" })
-map("n", "<leader><tab>8", "<cmd>tabn 8<cr>", { desc = "Tab 8" })
-map("n", "<leader><tab>9", "<cmd>tabn 9<cr>", { desc = "Tab 9" })
+for i = 1, 9 do
+  map("n", "<leader><tab>" .. i, "<cmd>tabn " .. i .. "<cr>", { desc = "Tab " .. i })
+end
 
 -- Buffers
 map("n", "<leader>bf", "<cmd>bfirst<cr>", { desc = "First Buffer" })
diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua
index 6f880529..5d196dbb 100644
--- a/.config/nvim/lua/plugins/bufferline.lua
+++ b/.config/nvim/lua/plugins/bufferline.lua
@@ -1,22 +1,21 @@
+local keys = {}
+
+-- stylua: ignore start
+for i = 1, 9 do
+  table.insert(keys, { "<leader>b" .. i, "<cmd>BufferLineGoToBuffer " .. i .. "<cr>", desc = "Buffer " .. i })
+end
+
+table.insert(keys, { "[B", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer prev" })
+table.insert(keys, { "]B", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer next" })
+table.insert(keys, { "<leader>.", "<Cmd>BufferLinePick<CR>", desc = "Pick Buffer" })
+
+table.insert(keys, { "<leader>bd", "<Cmd>BufferLineSortByDirectory<CR>", desc = "Sort By Directory" })
+table.insert(keys, { "<leader>bs", "<Cmd>BufferLineSortByExtension<CR>", desc = "Sort By Extensions" })
+-- stylua: ignore end
+
 return {
   "akinsho/bufferline.nvim",
-  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" },
-    { "<leader>b4", "<cmd>BufferLineGoToBuffer 4<cr>", desc = "Buffer 4" },
-    { "<leader>b5", "<cmd>BufferLineGoToBuffer 5<cr>", desc = "Buffer 5" },
-    { "<leader>b6", "<cmd>BufferLineGoToBuffer 6<cr>", desc = "Buffer 6" },
-    { "<leader>b7", "<cmd>BufferLineGoToBuffer 7<cr>", desc = "Buffer 7" },
-    { "<leader>b8", "<cmd>BufferLineGoToBuffer 8<cr>", desc = "Buffer 8" },
-    { "<leader>b9", "<cmd>BufferLineGoToBuffer 9<cr>", desc = "Buffer 9" },
-    { "<leader>b0", "<cmd>BufferLineGoToBuffer -1<cr>", desc = "Buffer -1" },
-  },
+  keys = keys,
   opts = {
     options = {
       modified_icon = "",
diff --git a/.config/nvim/lua/plugins/extras/editor/harpoon.lua b/.config/nvim/lua/plugins/extras/editor/harpoon.lua
index 2dd2ffe2..203d1051 100644
--- a/.config/nvim/lua/plugins/extras/editor/harpoon.lua
+++ b/.config/nvim/lua/plugins/extras/editor/harpoon.lua
@@ -1,3 +1,18 @@
+local keys = {}
+
+-- stylua: ignore start
+for i = 1, 9 do
+  table.insert(keys, { "<leader>h" .. i, function() require("harpoon"):list():select(i) end, desc = "File " .. i })
+end
+
+table.insert(keys, { "<leader>ha", function() require("harpoon"):list():append() end, desc = "Add Mark" })
+table.insert(keys, { "<leader>hh", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Menu" })
+table.insert(keys, { "<leader>hf", "<cmd>Telescope harpoon marks<CR>", desc = "Files" })
+
+table.insert(keys, { "]H", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" })
+table.insert(keys, { "[H", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" })
+-- stylua: ignore end
+
 return {
   {
     "ThePrimeagen/harpoon",
@@ -6,24 +21,7 @@ return {
       "nvim-lua/plenary.nvim",
     },
     --stylua: ignore
-    keys = {
-      { "<leader>ha", function() require("harpoon"):list():append() end, desc = "Add Mark" },
-      { "<leader>hh", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Menu" },
-      { "<leader>hf", "<cmd>Telescope harpoon marks<CR>", desc = "Files" },
-      { "<leader>h1", function() require("harpoon"):list():select(1) end, desc = "File 1" },
-      { "<leader>h2", function() require("harpoon"):list():select(2) end, desc = "File 2" },
-      { "<leader>h3", function() require("harpoon"):list():select(3) end, desc = "File 3" },
-      { "<leader>h4", function() require("harpoon"):list():select(4) end, desc = "File 4" },
-      { "<leader>h5", function() require("harpoon"):list():select(5) end, desc = "File 5" },
-      { "<leader>h6", function() require("harpoon"):list():select(6) end, desc = "File 6" },
-      { "<leader>h7", function() require("harpoon"):list():select(7) end, desc = "File 7" },
-      { "<leader>h8", function() require("harpoon"):list():select(8) end, desc = "File 8" },
-      { "<leader>h9", function() require("harpoon"):list():select(9) end, desc = "File 9" },
-      { "]H", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" },
-      { "[H", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" },
-      { "<M-]>", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" },
-      { "<M-[>", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" },
-    },
+    keys = keys,
     config = function()
       local harpoon = require("harpoon")
       harpoon:setup({})