diff --git a/lua/tokyonight/theme.lua b/lua/tokyonight/theme.lua
index 9f9f2da..837dab1 100644
--- a/lua/tokyonight/theme.lua
+++ b/lua/tokyonight/theme.lua
@@ -441,16 +441,16 @@ function M.setup()
     BufferLineIndicatorSelected = { fg = c.git.change },
 
     -- Barbar
-    BufferCurrent = { bg = c.fg_gutter, fg = c.fg },
-    BufferCurrentERROR = { bg = c.fg_gutter, fg = c.error },
-    BufferCurrentHINT = { bg = c.fg_gutter, fg = c.hint },
-    -- BufferCurrentIcon = { bg = c.fg_gutter, fg = c.},
-    BufferCurrentINFO = { bg = c.fg_gutter, fg = c.info },
-    BufferCurrentWARN = { bg = c.fg_gutter, fg = c.warning },
-    BufferCurrentIndex = { bg = c.fg_gutter, fg = c.info },
-    BufferCurrentMod = { bg = c.fg_gutter, fg = c.warning },
-    BufferCurrentSign = { bg = c.fg_gutter, fg = c.info },
-    BufferCurrentTarget = { bg = c.fg_gutter, fg = c.red },
+    BufferCurrent = { bg = c.bg, fg = c.fg },
+    BufferCurrentERROR = { bg = c.bg, fg = c.error },
+    BufferCurrentHINT = { bg = c.bg, fg = c.hint },
+    -- BufferCurrentIcon = { bg = c.bg, fg = c.},
+    BufferCurrentINFO = { bg = c.bg, fg = c.info },
+    BufferCurrentWARN = { bg = c.bg, fg = c.warning },
+    BufferCurrentIndex = { bg = c.bg, fg = c.info },
+    BufferCurrentMod = { bg = c.bg, fg = c.warning },
+    BufferCurrentSign = { bg = c.bg, fg = c.info },
+    BufferCurrentTarget = { bg = c.bg, fg = c.red },
     BufferAlternate = { bg = c.fg_gutter, fg = c.fg },
     BufferAlternateERROR = { bg = c.fg_gutter, fg = c.error },
     BufferAlternateHINT = { bg = c.fg_gutter, fg = c.hint },
@@ -471,18 +471,18 @@ function M.setup()
     BufferVisibleMod = { bg = c.bg_statusline, fg = c.warning },
     BufferVisibleSign = { bg = c.bg_statusline, fg = c.info },
     BufferVisibleTarget = { bg = c.bg_statusline, fg = c.red },
-    BufferInactive = { bg = c.bg_statusline, fg = c.dark5 },
-    BufferInactiveERROR = { bg = c.bg_statusline, fg = util.darken(c.error, 0.7) },
-    BufferInactiveHINT = { bg = c.bg_statusline, fg = util.darken(c.hint, 0.7) },
-    -- BufferInactiveIcon = { bg = c.bg_statusline, fg = util.darken(c., 0.7) },
-    BufferInactiveINFO = { bg = c.bg_statusline, fg = util.darken(c.info, 0.7) },
-    BufferInactiveWARN = { bg = c.bg_statusline, fg = util.darken(c.warning, 0.7) },
-    BufferInactiveIndex = { bg = c.bg_statusline, fg = c.dark5 },
-    BufferInactiveMod = { bg = c.bg_statusline, fg = util.darken(c.warning, 0.7) },
-    BufferInactiveSign = { bg = c.bg_statusline, fg = c.border_highlight },
-    BufferInactiveTarget = { bg = c.bg_statusline, fg = c.red },
+    BufferInactive = { bg = c.bg_highlight, fg = util.darken(c.dark5, 0.8) },
+    BufferInactiveERROR = { bg = c.bg_highlight, fg = util.darken(c.error, 0.8) },
+    BufferInactiveHINT = { bg = c.bg_highlight, fg = util.darken(c.hint, 0.8) },
+    -- BufferInactiveIcon = { bg = c.bg_statusline, fg = util.darken(c., 0.1) },
+    BufferInactiveINFO = { bg = c.bg_highlight, fg = util.darken(c.info, 0.8) },
+    BufferInactiveWARN = { bg = c.bg_highlight, fg = util.darken(c.warning, 0.8) },
+    BufferInactiveIndex = { bg = c.bg_highlight, fg = c.dark5 },
+    BufferInactiveMod = { bg = c.bg_highlight, fg = util.darken(c.warning, 0.8) },
+    BufferInactiveSign = { bg = c.bg_highlight, fg = c.border_highlight },
+    BufferInactiveTarget = { bg = c.bg_highlight, fg = c.red },
     BufferOffset = { bg = c.bg_statusline, fg = c.dark5 },
-    BufferTabpageFill = { bg = c.bg_statusline, fg = c.dark5 },
+    BufferTabpageFill = { bg = util.lighten(c.bg, 0.93), fg = c.dark5 },
     BufferTabpages = { bg = c.bg_statusline, fg = c.none },
 
     -- Sneak