diff --git a/README.md b/README.md
index ebfd447..8a3c6e6 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ A dark and light Neovim theme written in Lua ported from the Visual Studio Code
 - [Neogit](https://github.com/TimUntersberger/neogit)
 - [vim-sneak](https://github.com/justinmk/vim-sneak)
 - [Fern](https://github.com/lambdalisue/fern.vim)
+- [Barbar](https://github.com/romgrk/barbar.nvim)
 
 ## ⚡️ Requirements
 
diff --git a/lua/tokyonight/theme.lua b/lua/tokyonight/theme.lua
index 1c076d1..82c1675 100644
--- a/lua/tokyonight/theme.lua
+++ b/lua/tokyonight/theme.lua
@@ -369,6 +369,25 @@ function M.setup(config)
     BufferLineIndicatorSelected = { fg = c.git.change },
     BufferLineFill = { bg = c.black },
 
+    -- Barbar
+    BufferCurrent = { bg = c.fg_gutter, fg = c.fg },
+    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 },
+    BufferVisible = { bg = c.bg_statusline, fg = c.fg },
+    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 },
+    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 },
+    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 },
     SneakScope = { bg = c.bg_visual },