diff --git a/lua/tokyonight/theme.lua b/lua/tokyonight/theme.lua
index b5f278b..534f0da 100644
--- a/lua/tokyonight/theme.lua
+++ b/lua/tokyonight/theme.lua
@@ -429,22 +429,48 @@ function M.setup()
 
     -- 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 },
+    BufferAlternate = { bg = c.fg_gutter, fg = c.fg },
+    BufferAlternateERROR = { bg = c.fg_gutter, fg = c.error },
+    BufferAlternateHINT = { bg = c.fg_gutter, fg = c.hint },
+    -- BufferAlternateIcon = { bg = c.fg_gutter, fg = c. },
+    BufferAlternateIndex = { bg = c.fg_gutter, fg = c.info },
+    BufferAlternateINFO = { bg = c.fg_gutter, fg = c.info },
+    BufferAlternateMod = { bg = c.fg_gutter, fg = c.warning },
+    BufferAlternateSign = { bg = c.fg_gutter, fg = c.info },
+    BufferAlternateTarget = { bg = c.fg_gutter, fg = c.red },
+    BufferAlternateWARN = { bg = c.fg_gutter, fg = c.warning },
     BufferVisible = { bg = c.bg_statusline, fg = c.fg },
+    BufferVisibleERROR = { bg = c.bg_statusline, fg = c.error },
+    BufferVisibleHINT = { bg = c.bg_statusline, fg = c.hint },
+    -- BufferVisibleIcon = { bg = c.bg_statusline, fg = c. },
+    BufferVisibleINFO = { bg = c.bg_statusline, fg = c.info },
+    BufferVisibleWARN = { bg = c.bg_statusline, fg = c.warning },
     BufferVisibleIndex = { bg = c.bg_statusline, fg = c.info },
     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 },
+    BufferOffset = { bg = c.bg_statusline, fg = c.dark5 },
+    BufferTabpageFill = { bg = c.bg_statusline, fg = c.dark5 },
     BufferTabpages = { bg = c.bg_statusline, fg = c.none },
-    BufferTabpage = { bg = c.bg_statusline, fg = c.border_highlight },
 
     -- Sneak
     Sneak = { fg = c.bg_highlight, bg = c.magenta },