diff --git a/nvim/lua/psoxizsh/plugins/config/bufferline.lua b/nvim/lua/psoxizsh/plugins/config/bufferline.lua
index a33ab01..b5b1aad 100644
--- a/nvim/lua/psoxizsh/plugins/config/bufferline.lua
+++ b/nvim/lua/psoxizsh/plugins/config/bufferline.lua
@@ -3,7 +3,7 @@ return function()
 
   local defaults = {
     always_show_bufferline = true,
-    numbers = "none",
+    numbers = 'none',
     diagnostics = false,
     offsets = {{
       filetype = 'neo-tree',
@@ -11,7 +11,7 @@ return function()
       text_align = 'center'
     }},
     show_buffer_close_icons = false,
-    separator_style = { '\u{E0B0}', '\u{E0B1}' },
+    separator_style = 'slope',
     sort_by = 'relative_directory',
   }
 
diff --git a/nvim/lua/psoxizsh/plugins/config/fidget.lua b/nvim/lua/psoxizsh/plugins/config/fidget.lua
index b138f61..19e6ab7 100644
--- a/nvim/lua/psoxizsh/plugins/config/fidget.lua
+++ b/nvim/lua/psoxizsh/plugins/config/fidget.lua
@@ -2,9 +2,19 @@ return function()
   local fidget, util = require 'fidget', require 'psoxizsh.util'
 
   local defaults = {
-    text = { spinner = 'dots_snake' },
-    timer = { fidget_decay = 1500 },
-    fmt = { stack_upwards = true },
+    progress = {
+      display = {
+        progress_icon = {
+          pattern = "dots_snake",
+        },
+      },
+    },
+
+    notification = {
+      view = {
+        stack_upwards = true,
+      }
+    }
   }
 
   fidget.setup(util.mconfig('config.fidget', defaults))
diff --git a/nvim/lua/psoxizsh/plugins/config/gitsigns.lua b/nvim/lua/psoxizsh/plugins/config/gitsigns.lua
index 7fd0116..c3bd2be 100644
--- a/nvim/lua/psoxizsh/plugins/config/gitsigns.lua
+++ b/nvim/lua/psoxizsh/plugins/config/gitsigns.lua
@@ -3,8 +3,12 @@ return function()
 
   local defaults = {
     sign_priority = 100,
-    current_line_blame_formatter_opts = {
-      relative_time = false
+    current_line_blame_opts = {
+      virt_text = true,
+      virt_text_pos = 'eol',
+      delay = 1000,
+      ignore_whitespace = false,
+      virt_text_priority = 100,
     },
   }
 
diff --git a/nvim/lua/psoxizsh/plugins/config/nvim-cmp.lua b/nvim/lua/psoxizsh/plugins/config/nvim-cmp.lua
index 1355f9e..5cfc134 100644
--- a/nvim/lua/psoxizsh/plugins/config/nvim-cmp.lua
+++ b/nvim/lua/psoxizsh/plugins/config/nvim-cmp.lua
@@ -107,9 +107,9 @@ return function()
     mapping = mode.cmd(),
     sources = sources(
       {
-        { name = 'cmdline_history',   max_item_count = 1  },
-        { name = 'cmdline',           max_item_count = 10 },
-        { name = 'async_path',        max_item_count = 2  },
+        { name = 'async_path',        max_item_count = 5  },
+        { name = 'cmdline_history',   max_item_count = 2  },
+        { name = 'cmdline',           max_item_count = 3  },
       }
     )
   })
@@ -119,8 +119,8 @@ return function()
     sources = sources(
       {
         { name = 'cmdline_history',   max_item_count = 1  },
-        { name = 'cmdline',           max_item_count = 10 },
-        { name = 'buffer',            max_item_count = 2  },
+        { name = 'cmdline',           max_item_count = 4  },
+        { name = 'buffer',            max_item_count = 10 },
       }
     )
   })
diff --git a/nvim/lua/psoxizsh/plugins/plug.lua b/nvim/lua/psoxizsh/plugins/plug.lua
index 97750d9..7f605d7 100644
--- a/nvim/lua/psoxizsh/plugins/plug.lua
+++ b/nvim/lua/psoxizsh/plugins/plug.lua
@@ -60,17 +60,18 @@ local plugins = {
   },
   { 'akinsho/bufferline.nvim',
       as = 'bufferline',
-      tag = 'v2.*',
+      tag = 'v4.*',
       requires = { 'kyazdani42/nvim-web-devicons' },
       config = require 'psoxizsh.plugins.config.bufferline'
   },
   { 'lewis6991/gitsigns.nvim',
-      branch = 'main',
+      tag = 'v0.9.*',
       requires = { 'nvim-lua/plenary.nvim' },
       config = require 'psoxizsh.plugins.config.gitsigns'
   },
   -- LSP / Neovim '$/progress' handler
   { 'j-hui/fidget.nvim',
+      tag = "v1.*",
       config = require 'psoxizsh.plugins.config.fidget'
   },