diff --git a/runtime/themes/acme.toml b/runtime/themes/acme.toml
index 3bd5987a..d3be695c 100644
--- a/runtime/themes/acme.toml
+++ b/runtime/themes/acme.toml
@@ -20,6 +20,8 @@
 "diagnostic.error" = {bg="white", modifiers=["bold"]}
 "diagnostic.warning" = {bg="white", modifiers=["bold"]}
 "diagnostic.hint" = {bg="white", modifiers=["bold"]}
+"ui.bufferline" = { fg = "indent", bg = "acme_bar_bg" }
+"ui.bufferline.active" = { fg = "black", bg = "acme_bg" }
 
 [palette]
 white = "#ffffff"
diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index f6dc1c81..43fffee8 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -59,6 +59,8 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"ui.bufferline" = { fg = "gray", bg = "background" }
+"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
 "special" = { fg = "orange" }
 
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index 3a543f5f..7ea4ef58 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -59,6 +59,8 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"ui.bufferline" = { fg = "gray", bg = "dark_gray" }
+"ui.bufferline.active" = { fg = "dark", bg = "background" }
 
 "special" = { fg = "orange" }
 
@@ -76,3 +78,4 @@ magenta = "#a37acc"
 orange = "#fa8d3e"
 red = "#f07171"
 yellow = "#ffaa33"
+dark = "#131721"
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index d6c9410d..f3b49d87 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -59,6 +59,8 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"ui.bufferline" = { fg = "gray", bg = "black" }
+"ui.bufferline.active" = { fg = "foreground", bg = "background" }
 
 "special" = { fg = "orange" }
 
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index 460e7363..74bbcd2e 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -54,6 +54,9 @@
 "warning" = "base09"
 "error" = "base08"
 
+"ui.bufferline" = { fg = "base04", bg = "base00" }
+"ui.bufferline.active" = { fg = "base06", bg = "base01" }
+
 [palette]
 base00 = "#181818" # Default Background
 base01 = "#282828" # Lighter Background (Used for status bars, line number and folding marks)
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index 6874c39e..3784670f 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -54,6 +54,9 @@
 "warning" = "base09"
 "error" = "base08"
 
+"ui.bufferline" = { fg = "base04", bg = "base01" }
+"ui.bufferline.active" = { fg = "base07", bg = "base00" }
+
 [palette]
 base00 = "#f8f8f8" # Default Background
 base01 = "#e8e8e8" # Lighter Background (Used for status bars, line number and folding marks)
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index 44bbaf92..c1902b9b 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -48,6 +48,8 @@
 "ui.cursorline" = { bg = "#131920" }
 "ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
 "ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
+"ui.bufferline" = { fg = "#627d9d", bg = "#131920" }
+"ui.bufferline.active" = { fg = "#e5ded6", bg = "#232d38" }
 "ui.popup" = { bg = "#232d38" }
 "ui.window" = { bg = "#232d38" }
 "ui.help" = { bg = "#232d38", fg = "#e5ded6" }
diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml
index e7db8b16..89ae77c8 100644
--- a/runtime/themes/catppuccin_frappe.toml
+++ b/runtime/themes/catppuccin_frappe.toml
@@ -70,6 +70,9 @@
 "ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
 "ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
 
+"ui.bufferline" = { fg = "subtext1", bg = "mantle" }
+"ui.bufferline.active" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
@@ -134,4 +137,4 @@ crust = "#232634"
 
 # derived colors by blending existing palette colors
 cursorline = "#3b3f52"
-secondary_cursor = "#b8a5a6"
\ No newline at end of file
+secondary_cursor = "#b8a5a6"
diff --git a/runtime/themes/catppuccin_latte.toml b/runtime/themes/catppuccin_latte.toml
index 4cd8b3c1..8e8780f9 100644
--- a/runtime/themes/catppuccin_latte.toml
+++ b/runtime/themes/catppuccin_latte.toml
@@ -70,6 +70,10 @@
 "ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
 "ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
 
+"ui.bufferline" = { fg = "overlay2", bg = "surface1", modifiers = ["italic"] }
+"ui.bufferline.active" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+"ui.bufferline.background" = { bg = "surface1" }
+
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
@@ -134,4 +138,4 @@ crust = "#dce0e8"
 
 # derived colors by blending existing palette colors
 cursorline = "#e9ebf1"
-secondary_cursor = "#e2a99e"
\ No newline at end of file
+secondary_cursor = "#e2a99e"
diff --git a/runtime/themes/catppuccin_macchiato.toml b/runtime/themes/catppuccin_macchiato.toml
index da589101..c2fe3184 100644
--- a/runtime/themes/catppuccin_macchiato.toml
+++ b/runtime/themes/catppuccin_macchiato.toml
@@ -70,6 +70,9 @@
 "ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
 "ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
 
+"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "overlay1", bg = "mantle" }
+
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
@@ -134,4 +137,4 @@ crust = "#181926"
 
 # derived colors by blending existing palette colors
 cursorline = "#303347"
-secondary_cursor = "#b6a5a7"
\ No newline at end of file
+secondary_cursor = "#b6a5a7"
diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index 279859b2..c4750b28 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -70,6 +70,9 @@
 "ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
 "ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
 
+"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "overlay1", bg = "mantle" }
+
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
@@ -134,4 +137,4 @@ crust = "#11111b"
 
 # derived colors by blending existing palette colors
 cursorline = "#2a2b3c"
-secondary_cursor = "#b5a6a8"
\ No newline at end of file
+secondary_cursor = "#b5a6a8"
diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index 00176ff2..5e88438e 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -23,6 +23,8 @@
 "ui.virtual.ruler" = { bg = "grey02" }
 "ui.virtual.indent-guide" = "grey02"
 "ui.virtual.whitespace" = "grey03"
+"ui.bufferline" = { fg = "grey04", bg = "grey00" }
+"ui.bufferline.active" = { fg = "grey07", bg = "grey02" }
 
 "operator" = "grey05"
 "variable" = "white"
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 29a55281..f99da4fb 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -76,6 +76,10 @@
 "ui.statusline" = { fg = "white", bg = "blue" }
 "ui.statusline.inactive" = { fg = "white", bg = "blue" }
 
+"ui.bufferline" = { fg = "text", bg = "widget" }
+"ui.bufferline.active" = { fg = "white", bg = "blue" }
+"ui.bufferline.background" = { bg = "background" }
+
 "ui.text" = { fg = "text" }
 "ui.text.focus" = { fg = "white" }
 
diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml
index 4ff90476..c38c93ee 100644
--- a/runtime/themes/doom_acario_dark.toml
+++ b/runtime/themes/doom_acario_dark.toml
@@ -53,6 +53,9 @@
 'ui.statusline.normal' = { bg = 'base3' }
 'ui.statusline.insert' = { bg = 'base3' }
 'ui.statusline.select' = { bg = 'base3' }
+'ui.bufferline' = { fg = 'gray', bg = 'base2' }
+'ui.bufferline.active' = { fg = 'white', bg = 'base4' }
+'ui.bufferline.background' = { bg = 'bg' }
 'ui.popup' = { bg = 'bg-alt' }
 'ui.window' = { fg = 'gray' }
 'ui.help' = { fg = 'fg', bg = 'base2' }
diff --git a/runtime/themes/emacs.toml b/runtime/themes/emacs.toml
index 598020bd..cc725df8 100644
--- a/runtime/themes/emacs.toml
+++ b/runtime/themes/emacs.toml
@@ -54,6 +54,9 @@
 "ui.linenr.selected" = { fg = "gray80" }
 "ui.statusline" = { fg = "black", bg = "gray75" }
 "ui.statusline.inactive" = { fg = "gray20", bg = "gray90" }
+"ui.bufferline" = { fg = "gray36", bg = "gray90", modifiers = ["underlined"] }
+"ui.bufferline.active" = { fg = "gray0", bg = "gray99" }
+"ui.bufferline.background" = { bg = "gray75" }
 "ui.popup" = { fg = "black", bg = "gray97" }
 "ui.popup.info" = { fg = "black", bg = "gray97" }
 "ui.window" = { fg = "black" }