diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index c902805..ea1e877 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -2,14 +2,10 @@
 
 #: Fonts {{{
 
-font_family      RobotoMono Nerd Font
-# bold_font        Roboto Mono Bold
-# italic_font      Roboto Mono Italic
-# bold_italic_font Roboto Mono Bold Italic
-font_size 9
-font_features none
-# symbol_map U+E007-U+F8E8 Font Awesome 6 Brands
-# symbol_map U+F022 Font Awesome 6 Free
+font_family  RobotoMono Nerd Font
+font_size    9
+modify_font  underline_thickness 2px
+modify_font  underline_position  4px
 
 #: }}}
 
diff --git a/.config/nvim/lua/core/plugins.lua b/.config/nvim/lua/core/plugins.lua
index 9078ddc..a3ac80e 100644
--- a/.config/nvim/lua/core/plugins.lua
+++ b/.config/nvim/lua/core/plugins.lua
@@ -117,8 +117,8 @@ require("lazy").setup({
 	},
 	{
 		"jcdickinson/codeium.nvim",
-         event = 'BufEnter'
-    },
+		event = "BufEnter",
+	},
 
 	-- Snippets
 	{ "L3MON4D3/LuaSnip", version = "v1.*" },
diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua
index 0278e45..a114e61 100644
--- a/.config/nvim/lua/plugins/bufferline.lua
+++ b/.config/nvim/lua/plugins/bufferline.lua
@@ -1,86 +1,19 @@
 require("bufferline").setup({
 	options = {
-		close_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions"
-		right_mouse_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions"
+		close_command = "Bdelete! %d",
+		right_mouse_command = "Bdelete! %d",
 		offsets = {
 			{ filetype = "neo-tree", text = "", padding = 1 },
 			{ filetype = "dapui_scopes", text = "", padding = 1 },
 		},
 		indicator = {
-			style = "none",
+			style = "underline",
 		},
-	},
-	highlights = {
-		fill = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		background = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		buffer_visible = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		close_button = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		close_button_visible = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		tab_selected = {
-			fg = { attribute = "fg", highlight = "Normal" },
-			bg = { attribute = "bg", highlight = "Normal" },
-		},
-		tab = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		tab_close = {
-			fg = { attribute = "fg", highlight = "TabLineSel" },
-			bg = { attribute = "bg", highlight = "Normal" },
-		},
-		duplicate_selected = {
-			fg = { attribute = "fg", highlight = "TabLineSel" },
-			bg = { attribute = "bg", highlight = "TabLineSel" },
-			italic = true,
-		},
-		duplicate_visible = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-			italic = true,
-		},
-		duplicate = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-			italic = true,
-		},
-		modified = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		modified_selected = {
-			fg = { attribute = "fg", highlight = "Normal" },
-			bg = { attribute = "bg", highlight = "Normal" },
-		},
-		modified_visible = {
-			fg = { attribute = "fg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		separator = {
-			fg = { attribute = "bg", highlight = "TabLine" },
-			bg = { attribute = "bg", highlight = "TabLine" },
-		},
-		separator_selected = {
-			fg = { attribute = "bg", highlight = "Normal" },
-			bg = { attribute = "bg", highlight = "Normal" },
-		},
-		indicator_selected = {
-			fg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" },
-			bg = { attribute = "bg", highlight = "Normal" },
+		hover = {
+			enabled = true,
+			delay = 200,
+			reveal = { "close" },
 		},
+		separator_style = "slant",
 	},
 })
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
index 26ecc31..fdf36a5 100644
--- a/.config/nvim/lua/plugins/init.lua
+++ b/.config/nvim/lua/plugins/init.lua
@@ -7,8 +7,6 @@ require("plugins.autopairs")
 require("plugins.comment")
 require("plugins.gitsigns")
 require("plugins.neo-tree")
-require("plugins.bufferline")
-require("plugins.lualine")
 require("plugins.illuminate")
 require("plugins.indentline")
 require("plugins.lsp")
@@ -22,3 +20,5 @@ require("plugins.projections")
 require("plugins.diffview")
 require("plugins.align")
 require("plugins.ufo")
+require("plugins.bufferline")
+require("plugins.lualine")