diff --git a/lua/nxvim/init.lua b/lua/nxvim/init.lua
index 857508f..a9991f9 100644
--- a/lua/nxvim/init.lua
+++ b/lua/nxvim/init.lua
@@ -48,8 +48,8 @@ local modules = {
 	{ "tenxsoydev/karen-yank.nvim", event = "VeryLazy", config = true },
 
 	-- Buffer- & Window Management -----------------------------------------------
-	{ "akinsho/bufferline.nvim", config = "plugins.bufferline" },
-	-- { "romgrk/barbar.nvim", event = "VeryLazy", config = "plugins.barbar" },
+	-- { "akinsho/bufferline.nvim", config = "plugins.bufferline" },
+	{ "romgrk/barbar.nvim", event = "VeryLazy", config = "plugins.barbar" },
 	{ "Bekaboo/dropbar.nvim", event = "VeryLazy", config = "plugins.dropbar" },
 	{ "kwkarlwang/bufresize.nvim", event = "VeryLazy", config = true }, -- handle split window sizes on client resize
 	{ "gorbit99/codewindow.nvim", event = "VeryLazy", config = "plugins.codewindow" },
diff --git a/lua/nxvim/plugins/barbar.lua b/lua/nxvim/plugins/barbar.lua
index 3fd301b..40f8529 100644
--- a/lua/nxvim/plugins/barbar.lua
+++ b/lua/nxvim/plugins/barbar.lua
@@ -98,7 +98,7 @@ nx.hl({
 	-- TODO: Dyanmic theme colors instead of hex
 	{ "BufferAlternate", fg = "#9dacb9", italic = true },
 
-	{ "BufferVisible", fg = "#9dacb9", bg = "none" },
+	{ { "BufferVisible", "TabLineFill" }, fg = "#9dacb9", bg = "none" },
 	{ "BufferVisibleSign", fg = "TabLine:bg", bg = "BufferVisible:bg" },
 
 	{ "BufferInactive", fg = "Comment:fg", bg = "TabLine:bg" },