diff --git a/after/plugin/bufferline.lua b/after/plugin/bufferline.lua
index 7afbf94..450420d 100644
--- a/after/plugin/bufferline.lua
+++ b/after/plugin/bufferline.lua
@@ -29,5 +29,14 @@ bufferline.setup {
             return icon, hl
         end,
         always_show_bufferline = true,
+        diagnostics = "nvim_lsp",
+        diagnostics_update_in_insert = false,
+        diagnostics_indicator = function(count, level, diagnostics_dict, context)
+            if context.buffer:current() then
+                return ''
+            end
+
+            return ''
+        end
     }
 }
diff --git a/lua/taken/remaps.lua b/lua/taken/remaps.lua
index ee967e2..66dd4a7 100644
--- a/lua/taken/remaps.lua
+++ b/lua/taken/remaps.lua
@@ -1,53 +1,59 @@
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+local set = vim.keymap.set
 
-vim.keymap.set("n", "J", "mzJ`z")
-vim.keymap.set("n", "<C-d>", "<C-d>zz")
-vim.keymap.set("n", "<C-u>", "<C-u>zz")
-vim.keymap.set("n", "n", "nzzzv")
-vim.keymap.set("n", "N", "Nzzzv")
+set('n', ':', '<cmd>FineCmdline<CR>', {noremap = true})
+set("v", "J", ":m '>+1<CR>gv=gv")
+set("v", "K", ":m '<-2<CR>gv=gv")
+
+set("n", "J", "mzJ`z")
+set("n", "<C-d>", "<C-d>zz")
+set("n", "<C-u>", "<C-u>zz")
+set("n", "n", "nzzzv")
+set("n", "N", "Nzzzv")
 
 -- greatest remap ever
--- vim.keymap.set("x", "<leader>p", [["_dP]])
+-- set("x", "<leader>p", [["_dP]])
 
 -- next greatest remap ever : asbjornHaland
-vim.keymap.set({"n", "v"}, "<leader>y", [["+y]], { desc = "Yank in to sys clipboard" })
-vim.keymap.set("n", "<leader>P", [["+p]], { desc = "Paste from sys clipboard" })
-vim.keymap.set({"n", "v"}, "<leader>d", [["_d]], { desc = "Actually deletes text" })
+set({"n", "v"}, "<leader>y", [["+y]], { desc = "Yank in to sys clipboard" })
+set("n", "<leader>P", [["+p]], { desc = "Paste from sys clipboard" })
+set({"n", "v"}, "<leader>d", [["_d]], { desc = "Actually deletes text" })
 
-vim.keymap.set("n", "Q", "<nop>")
-vim.keymap.set("n", "<leader>bf", vim.lsp.buf.format, { desc = "Formate buffer" })
-vim.keymap.set("n", "<leader>bs", ":write <CR>", { desc = "Save buffer" })
-vim.keymap.set("n", "<leader>bt", ":terminal pwsh.exe <CR>", { desc = "Open terminal" })
+set("n", "Q", "<nop>")
+set("n", "<leader>bf", vim.lsp.buf.format, { desc = "Formate buffer" })
+set("n", "<leader>bs", ":write <CR>", { desc = "Save buffer" })
+set("n", "<leader>bt", ":terminal pwsh.exe <CR>", { desc = "Open terminal" })
+set("n", "<leader><Tab>", ":BufferLineCycleNext <CR>", { desc = "Cycle tabs" })
+set("n", "<leader>bn", ":BufferLineCycleNext <CR>", { desc = "Next tab" })
+set("n", "<leader>bp", ":BufferLineCyclePrev <CR>", { desc = "NextPrevious tab" })
 
-vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
-vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
-vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
-vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
+set("n", "<C-k>", "<cmd>cnext<CR>zz")
+set("n", "<C-j>", "<cmd>cprev<CR>zz")
+set("n", "<leader>k", "<cmd>lnext<CR>zz")
+set("n", "<leader>j", "<cmd>lprev<CR>zz")
 
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], {desc = "Replace all instances of the word on cursor"})
+set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], {desc = "Replace all instances of the word on cursor"})
 
-vim.keymap.set("n", "<leader><leader>", function()
+set("n", "<leader><leader>", function()
     vim.cmd("so")
 end,
 { desc = "Source current file" })
 
 -- Packer
-vim.keymap.set("n", "<leader>pu", ":PackerUpdate <CR>")
-vim.keymap.set("n", "<leader>ps", ":PackerSync <CR>")
-vim.keymap.set("n", "<leader>pc", ":PackerClean <CR>")
-vim.keymap.set("n", "<leader>po", ":PackerCompile <CR>")
+set("n", "<leader>pu", ":PackerUpdate <CR>")
+set("n", "<leader>ps", ":PackerSync <CR>")
+set("n", "<leader>pc", ":PackerClean <CR>")
+set("n", "<leader>po", ":PackerCompile <CR>")
 
 -- nvim-tree
-vim.keymap.set("n", "<leader>n", ":NvimTreeToggle <CR>")
-vim.keymap.set("n", "<leader>e", ":NvimTreeFocus <CR>")
-vim.keymap.set("n", "<leader>r", ":NvimTreeRefresh <CR>")
+set("n", "<leader>n", ":NvimTreeToggle <CR>")
+set("n", "<leader>e", ":NvimTreeFocus <CR>")
+set("n", "<leader>r", ":NvimTreeRefresh <CR>")
 
 -- trouble
-vim.keymap.set("n", "<leader>tt", "<cmd>TroubleToggle <CR>", { silent = true })
+set("n", "<leader>tt", "<cmd>TroubleToggle <CR>", { silent = true })
 
 -- markdown preview
-vim.keymap.set("n", "<leader>bm", "<cmd>MarkdownPreviewToggle <CR>", { silent = true })
+set("n", "<leader>bm", "<cmd>MarkdownPreviewToggle <CR>", { silent = true })
 
 -- neogit
-vim.keymap.set("n", "<leader>gg", "<cmd>Neogit <CR>", { silent = true })
+set("n", "<leader>gg", "<cmd>Neogit <CR>", { silent = true })