diff --git a/lazy-lock.json b/lazy-lock.json
index 9ad7301..5480e2d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,6 +1,6 @@
 {
   "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" },
-  "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" },
+  "barbar.nvim": { "branch": "master", "commit": "31b6951c53a59bccfa91bf3984ed1510a940c836" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
diff --git a/lua/plugins/barbar.lua b/lua/plugins/barbar.lua
new file mode 100644
index 0000000..098cbe5
--- /dev/null
+++ b/lua/plugins/barbar.lua
@@ -0,0 +1,54 @@
+vim.g.barbar_auto_setup = false
+
+return {
+  {
+    'romgrk/barbar.nvim',
+    dependencies = {
+      'lewis6991/gitsigns.nvim',
+      'nvim-tree/nvim-web-devicons',
+    },
+    version = '^1.0.0',
+    config = function()
+      require('barbar').setup {
+        icons = {
+          pinned = { button = '', filename = true },
+        },
+      }
+
+      local function map(mode, lhs, rhs, desc)
+        local opts = { silent = true, noremap = true, desc = desc or '' }
+        vim.keymap.set(mode, lhs, rhs, opts)
+      end
+
+      map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', 'Goto Previous Buffer')
+      map('n', '<A-.>', '<Cmd>BufferNext<CR>', 'Goto Next Buffer')
+      map('n', '[b', '<Cmd>BufferPrevious<CR>', 'Goto Previous Buffer')
+      map('n', ']b', '<Cmd>BufferNext<CR>', 'Goto Next Buffer')
+
+      map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', 'Move Buffer Left')
+      map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', 'Move Buffer Right')
+      map('n', '[B', '<Cmd>BufferMovePrevious<CR>', 'Move Buffer Left')
+      map('n', ']B', '<Cmd>BufferMoveNext<CR>', 'Move Buffer Right')
+
+      map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', 'Goto Buffer #1')
+      map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', 'Goto Buffer #2')
+      map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', 'Goto Buffer #3')
+      map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', 'Goto Buffer #4')
+      map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', 'Goto Buffer #5')
+      map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', 'Goto Buffer #6')
+      map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', 'Goto Buffer #7')
+      map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', 'Goto Buffer #8')
+      map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', 'Goto Buffer #9')
+      map('n', '<A-0>', '<Cmd>BufferLast<CR>', 'Goto Last Buffer')
+
+      map('n', '<A-p>', '<Cmd>BufferPin<CR>', 'Pin/Unpin Buffer')
+      map('n', '<leader>bp', '<Cmd>BufferPin<CR>', 'Toggle [P]in')
+
+      map('n', '<A-c>', '<Cmd>BufferClose<CR>', 'Close Current Buffer')
+      map('n', '<leader>bd', '<Cmd>BufferClose<CR>', 'Close Current Buffer')
+
+      map('n', '<leader>bc', '<Cmd>BufferCloseAllButCurrentOrPined<CR>', 'Close Other Buffers')
+      map('n', '<leader>ba', '<Cmd>BufferCloseAllBunPinned<CR>', 'Close All Buffers')
+    end,
+  },
+}
diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua
deleted file mode 100644
index 22071b0..0000000
--- a/lua/plugins/bufferline.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- Required by bufferline
-vim.opt.termguicolors = true
-
-return {
-  {
-    'akinsho/bufferline.nvim',
-    dependencies = {
-      'nvim-tree/nvim-web-devicons',
-    },
-    config = function()
-      require('bufferline').setup {
-        options = {
-          always_show_bufferline = true,
-          offsets = {
-            {
-              filetype = 'neo-tree',
-              text = 'Neo-tree',
-              highlight = 'Directory',
-              text_align = 'left',
-            },
-          },
-        },
-      }
-
-      vim.keymap.set('n', '<leader>bd', '<Cmd>bdelete<CR>', { desc = '[D]elete Buffer' })
-      vim.keymap.set('n', '<leader>bp', '<Cmd>BufferLineTogglePin<CR>', { desc = 'Toggle [P]in' })
-      vim.keymap.set('n', '<leader>bP', '<Cmd>BufferLineGroupClose ungrouped<CR>', { desc = 'Delete Un-[P]inned Buffers' })
-      vim.keymap.set('n', '<leader>bo', '<Cmd>BufferLineCloseOthers<CR>', { desc = 'Delete All [O]ther Buffers' })
-      vim.keymap.set('n', '<leader>br', '<Cmd>BufferLineCloseRight<CR>', { desc = 'Delete Buffers to the [R]ight' })
-      vim.keymap.set('n', '<leader>bl', '<Cmd>BufferLineCloseLeft<CR>', { desc = 'Delete Buffers to the [L]eft' })
-      vim.keymap.set('n', '[b', '<Cmd>BufferLineCyclePrev<CR>', { desc = 'Prev Buffer' })
-      vim.keymap.set('n', ']b', '<Cmd>BufferLineCycleNext<CR>', { desc = 'Next Buffer' })
-      vim.keymap.set('n', '[B', '<Cmd>BufferLineMovePrev<CR>', { desc = 'Move buffer prev' })
-      vim.keymap.set('n', ']B', '<Cmd>BufferLineMoveNext<CR>', { desc = 'Move buffer next' })
-    end,
-  },
-}