diff --git a/init.lua b/init.lua
index 25ba2bd..ececd85 100644
--- a/init.lua
+++ b/init.lua
@@ -1,7 +1,6 @@
 -- load all plugins
 require "pluginList"
 require "options"
-require "plugins.bufferline"
 
 local g = vim.g
 
@@ -16,5 +15,6 @@ base16(base16.themes["onedark"], true)
 
 require "highlights"
 require "mappings"
+require "plugins.bufferline"
 
 require("utils").hideStuff()
diff --git a/lua/highlights.lua b/lua/highlights.lua
index 511393c..107aafb 100644
--- a/lua/highlights.lua
+++ b/lua/highlights.lua
@@ -102,39 +102,6 @@ fg("LspDiagnosticsVirtualTextInformation", green)
 fg("LspDiagnosticsSignHint", purple)
 fg("LspDiagnosticsVirtualTextHint", purple)
 
--- bufferline
-
-fg_bg("BufferLineFill", grey_fg, black2)
-fg_bg("BufferLineBackground", light_grey, black2)
-
-fg_bg("BufferLineBufferVisible", light_grey, black2)
-fg_bg("BufferLineBufferSelected", white, black)
-
-cmd "hi BufferLineBufferSelected gui=bold"
-
--- tabs
-fg_bg("BufferLineTab", light_grey, one_bg3)
-fg_bg("BufferLineTabSelected", black2, nord_blue)
-fg_bg("BufferLineTabClose", red, black)
-
-fg_bg("BufferLineIndicator", black2, black2)
-fg_bg("BufferLineIndicatorSelected", black, black)
-
--- separators
-fg_bg("BufferLineSeparator", black2, black2)
-fg_bg("BufferLineSeparatorVisible", black2, black2)
-fg_bg("BufferLineSeparatorSelected", black, black2)
-
--- modified buffers
-fg_bg("BufferLineModified", red, black2)
-fg_bg("BufferLineModifiedVisible", red, black2)
-fg_bg("BufferLineModifiedSelected", green, black)
-
--- close buttons
-fg_bg("BufferLineCLoseButtonVisible", light_grey, black2)
-fg_bg("BufferLineCLoseButton", light_grey, black2)
-fg_bg("BufferLineCLoseButtonSelected", red, black)
-
 -- dashboard
 
 fg("DashboardHeader", grey_fg)
diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua
index eb56214..342e687 100644
--- a/lua/plugins/bufferline.lua
+++ b/lua/plugins/bufferline.lua
@@ -1,3 +1,6 @@
+local global_theme = "themes/" .. vim.g.nvchad_theme
+local colors = require(global_theme)
+
 require "bufferline".setup {
     options = {
         offsets = {{filetype = "NvimTree", text = "", padding = 1}},
@@ -14,6 +17,84 @@ require "bufferline".setup {
         view = "multiwindow",
         show_buffer_close_icons = true,
         separator_style = "thin",
-        mappings = "true"
+        mappings = true,
+        always_show_bufferline = true
+    },
+    highlights = {
+        fill = {
+            guifg = colors.grey_fg,
+            guibg = colors.black2
+        },
+        background = {
+            guifg = colors.grey_fg,
+            guibg = colors.black2
+        },
+        -- buffers
+        buffer_visible = {
+            guifg = colors.light_grey,
+            guibg = colors.black2
+        },
+        buffer_selected = {
+            guifg = colors.white,
+            guibg = colors.black,
+            gui = "bold"
+        },
+        -- tabs
+        tab = {
+            guifg = colors.light_grey,
+            guibg = colors.one_bg3
+        },
+        tab_selected = {
+            guifg = colors.black2,
+            guibg = colors.nord_blue
+        },
+        tab_close = {
+            guifg = colors.red,
+            guibg = colors.black
+        },
+        indicator_selected = {
+            guifg = colors.black,
+            guibg = colors.black
+        },
+        -- separators
+        separator = {
+            guifg = colors.black2,
+            guibg = colors.black2
+        },
+        separator_visible = {
+            guifg = colors.black2,
+            guibg = colors.black2
+        },
+        separator_selected = {
+            guifg = colors.black2,
+            guibg = colors.black2
+        },
+        -- modified
+        modified = {
+            guifg = colors.red,
+            guibg = colors.black2
+        },
+        modified_visible = {
+            guifg = colors.red,
+            guibg = colors.black2
+        },
+        modified_selected = {
+            guifg = colors.green,
+            guibg = colors.black
+        },
+        -- close buttons
+
+        close_button = {
+            guifg = colors.light_grey,
+            guibg = colors.black2
+        },
+        close_button_visible = {
+            guifg = colors.light_grey,
+            guibg = colors.black2
+        },
+        close_button_selected = {
+            guifg = colors.red,
+            guibg = colors.black
+        }
     }
 }