diff --git a/init.lua b/init.lua
index 22b742f..90e718f 100644
--- a/init.lua
+++ b/init.lua
@@ -46,7 +46,7 @@ opt.breakindent = true
 opt.foldmethod = "expr"
 opt.foldlevelstart = 99
 opt.foldexpr = 'nvim_treesitter#foldexpr()'
-opt.sessionoptions = 'blank,buffers,curdir,help,tabpages,winsize,terminal'
+opt.sessionoptions = 'blank,buffers,curdir,help,tabpages,winsize,terminal,globals'
 
 require("bootstrap")
 
diff --git a/lua/mappings.lua b/lua/mappings.lua
index c3e2d75..7d5035c 100644
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -8,11 +8,17 @@ s("i", "<C-l>", "<Right>", { desc = "Move right" })
 s("i", "<C-j>", "<Down>", { desc = "Move down" })
 s("i", "<C-k>", "<Up>", { desc = "Move up" })
 s("n", "<Esc>", ":noh<CR>", { desc = "Clear highlights" })
-s("n", "<leader>b", "<cmd> enew <CR>", { desc = "New buffer" })
-s("n", "<leader>x", "<cmd> bdelete <CR>", { desc = "Delete buffer" })
 s("n", "<leader>!x", "<cmd> bdelete! <CR>", { desc = "Delete buffer !" })
-s("n", "<a-c-j>", "<cmd> bn <CR>", { desc = "Next buffer" })
-s("n", "<a-c-k>", "<cmd> bp <CR>", { desc = "Previous buffer" })
+
+s("n", "<leader>x", "<cmd> BufferClose <CR>",             { desc = "Delete buffer" })
+s("n", "<leader>X", "<cmd> BufferCloseAllButPinned <CR>", { desc = "Delete all buffers except pinned" })
+s("n", "<a-c-j>",   "<cmd> BufferMoveNext <CR>",          { desc = "Move buffer forward" })
+s("n", "<a-c-k>",   "<cmd> BufferMovePrevious <CR>",      { desc = "Move buffer backward" })
+s("n", "<a-j>",     "<cmd> BufferNext <CR>",              { desc = "Next buffer" })
+s("n", "<a-k>",     "<cmd> BufferPrevious <CR>",          { desc = "Previous buffer" })
+s('n', '<leader>p', "<cmd> BufferPin <cr>",               { desc = "Pin/Unpin buffer" })
+
+
 s("n", "ZZ", "<cmd> q! <CR>", { desc = "Quit without saving" })
 s("n", "q:", "<nop>")
 s('n', 'H', require('treesj').toggle)
@@ -115,8 +121,8 @@ s('n', '<f7>', dap.step_over, { desc = "Step over" })
 s('n', '<f8>', dap.step_out, { desc = "Step out" })
 s('n', '<f9>', dap.run_to_cursor, { desc = "Run to cursor" })
 s('n', '<f10>', dap.step_back, { desc = "Step back" })
-s('n', '<A-j>', dap.up, { desc = "Up" })
-s('n', '<A-k>', dap.down, { desc = "Down" })
+s('n', '<A-u>', dap.up, { desc = "Up" })
+s('n', '<A-d>', dap.down, { desc = "Down" })
 -- s('n', '<rightmouse>', dapui.eval, { desc = "Eval" })
 -- s('n', '<rightmouse>', '<LeftMouse> :lua require("dapui").eval()<cr>', { desc = "Eval" })
 s('n', '<f12>', function()
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 1fdb73f..76efa31 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -161,14 +161,58 @@ local plugins = {
     opts = require("configs.lualine")
   },
   {
-    'akinsho/bufferline.nvim',
-    version = "*",
-    dependencies = { 'nvim-tree/nvim-web-devicons', 'catppuccin' },
-    config = function()
-      require("bufferline").setup({
-        highlights = require("catppuccin.groups.integrations.bufferline").get()
-      })
-    end
+    'romgrk/barbar.nvim',
+    dependencies = {
+      'lewis6991/gitsigns.nvim',     -- OPTIONAL: for git status
+      'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
+    },
+    init = function()
+      vim.g.barbar_auto_setup = false
+    end,
+    opts = {
+      -- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
+      -- animation = true,
+      icons = {
+        -- Configure the base icons on the bufferline.
+        -- Valid options to display the buffer index and -number are `true`, 'superscript' and 'subscript'
+        buffer_index = false,
+        buffer_number = false,
+        gitsigns = {
+          added   = { enabled = false, icon = '+' },
+          changed = { enabled = false, icon = '~' },
+          deleted = { enabled = false, icon = '-' },
+        },
+        filetype = {
+          -- Sets the icon's highlight group.
+          -- If false, will use nvim-web-devicons colors
+          custom_colors = false,
+
+          -- Requires `nvim-web-devicons` if `true`
+          enabled = false,
+        },
+        separator = { left = '▎', right = '' },
+
+        -- If true, add an additional separator at the end of the buffer list
+        separator_at_end = true,
+
+        -- Configure the icons on the bufferline when modified or pinned.
+        -- Supports all the base icon options.
+        modified = { button = '●' },
+        pinned = { button = '', filename = true },
+
+        -- Use a preconfigured buffer appearance— can be 'default', 'powerline', or 'slanted'
+        preset = 'default',
+
+        -- Configure the icons on the bufferline based on the visibility of a buffer.
+        -- Supports all the base icon options, plus `modified` and `pinned`.
+        alternate = { filetype = { enabled = false } },
+        current = { buffer_index = false },
+        inactive = { button = '×' },
+        visible = { modified = { buffer_number = false } },
+      },
+      -- …etc.
+    },
+    version = '^1.0.0', -- optional: only update when a new 1.x version is released
   },
   {
     'numToStr/Comment.nvim',
@@ -200,6 +244,7 @@ local plugins = {
         pre_save_cmds = {
           function()
             require("dap-utils").store_breakpoints("./.breakpoints")
+            vim.api.nvim_exec_autocmds('User', {pattern = 'SessionSavePre'})
           end
         },
         post_restore_cmds = {