diff --git a/lua/base46/init.lua b/lua/base46/init.lua
index a1d8d46..814e59d 100644
--- a/lua/base46/init.lua
+++ b/lua/base46/init.lua
@@ -116,10 +116,6 @@ M.load_highlight = function(group)
 end
 
 M.load_theme = function()
-   -- set bg option
-   local theme_type = M.get_theme_tb "type" -- dark/light
-   vim.opt.bg = theme_type
-
    M.load_highlight "defaults"
    M.load_highlight "statusline"
    M.load_highlight(M.turn_str_to_color(config.ui.hl_add))
diff --git a/lua/base46/integrations/defaults.lua b/lua/base46/integrations/defaults.lua
index aeaab6a..9f3e4c7 100644
--- a/lua/base46/integrations/defaults.lua
+++ b/lua/base46/integrations/defaults.lua
@@ -29,38 +29,12 @@ return {
    -- packer
    PackerPackageName = { fg = colors.red },
    PackerSuccess = { fg = colors.green },
+   PackerStatusSuccess = { fg = theme.base08 },
+   PackerStatusCommit = { fg = colors.blue },
    PackeProgress = { fg = colors.blue },
    PackerOutput = { fg = colors.red },
    PackerStatus = { fg = colors.blue },
-
-   -- diffs
-   DiffAdd = {
-      fg = colors.blue,
-   },
-
-   DiffAdded = {
-      fg = colors.green,
-   },
-
-   DiffChange = {
-      fg = colors.light_grey,
-   },
-
-   DiffChangeDelete = {
-      fg = colors.red,
-   },
-
-   DiffModified = {
-      fg = colors.orange,
-   },
-
-   DiffDelete = {
-      fg = colors.red,
-   },
-
-   DiffRemoved = {
-      fg = colors.red,
-   },
+   PackerHash = { fg = colors.blue },
 
    Normal = {
       fg = theme.base05,
diff --git a/lua/base46/integrations/git.lua b/lua/base46/integrations/git.lua
index 329eac8..a9755ef 100644
--- a/lua/base46/integrations/git.lua
+++ b/lua/base46/integrations/git.lua
@@ -3,6 +3,34 @@ local colors = require("base46").get_theme_tb "base_30"
 
 return {
 
+   DiffAdd = {
+      fg = colors.blue,
+   },
+
+   DiffAdded = {
+      fg = colors.green,
+   },
+
+   DiffChange = {
+      fg = colors.light_grey,
+   },
+
+   DiffChangeDelete = {
+      fg = colors.red,
+   },
+
+   DiffModified = {
+      fg = colors.orange,
+   },
+
+   DiffDelete = {
+      fg = colors.red,
+   },
+
+   DiffRemoved = {
+      fg = colors.red,
+   },
+
    -- git commits
    gitcommitOverflow = {
       fg = theme.base08,
diff --git a/lua/base46/integrations/nvimtree.lua b/lua/base46/integrations/nvimtree.lua
index c7f46f8..321c32e 100644
--- a/lua/base46/integrations/nvimtree.lua
+++ b/lua/base46/integrations/nvimtree.lua
@@ -30,6 +30,10 @@ return {
       fg = colors.yellow,
    },
 
+   NvimTreeGitDeleted = {
+      fg = colors.red,
+   },
+
    NvimTreeSpecialFile = {
       fg = colors.yellow,
       bold = true,
diff --git a/lua/base46/integrations/tbline.lua b/lua/base46/integrations/tbline.lua
new file mode 100644
index 0000000..86e253a
--- /dev/null
+++ b/lua/base46/integrations/tbline.lua
@@ -0,0 +1,71 @@
+local colors = require("base46").get_theme_tb "base_30"
+
+return {
+
+   TblineFill = {
+      bg = colors.black2,
+   },
+
+   TbLineBufOn = {
+      fg = colors.white,
+      bg = colors.black,
+   },
+
+   TbLineBufOff = {
+      fg = colors.light_grey,
+      bg = colors.black2,
+   },
+
+   TbLineBufOnModified = {
+      fg = colors.green,
+      bg = colors.black,
+   },
+
+   TbBufLineBufOffModified = {
+      fg = colors.red,
+      bg = colors.black2,
+   },
+
+   TbLineBufOnClose = {
+      fg = colors.red,
+      bg = colors.black,
+   },
+
+   TbLineBufOffClose = {
+      fg = colors.light_grey,
+      bg = colors.black2,
+   },
+
+   TbLineTabOn = {
+      fg = colors.black,
+      bg = colors.nord_blue,
+      bold = true,
+   },
+
+   TbLineTabOff = {
+      fg = colors.white,
+      bg = colors.one_bg2,
+   },
+
+   TbLineTabCloseBtn = {
+      fg = colors.black,
+      bg = colors.nord_blue,
+   },
+
+   TBTabTitle = {
+      fg = colors.black,
+      bg = colors.white,
+   },
+
+   TbLineThemeToggleBtn = {
+      bold = true,
+      fg = colors.white,
+      bg = colors.black,
+   },
+
+   TblineTabNewBtn = {
+      fg = colors.white,
+      bg = colors.one_bg3,
+      bold = true,
+   },
+}
diff --git a/lua/base46/term.lua b/lua/base46/term.lua
index 0addd6f..04ee66b 100644
--- a/lua/base46/term.lua
+++ b/lua/base46/term.lua
@@ -1,6 +1,6 @@
 local colors = require("base46").get_theme_tb "base_16"
 
-vim.g.terminal_color_0 = colors.base02
+vim.g.terminal_color_0 = colors.base01
 vim.g.terminal_color_1 = colors.base08
 vim.g.terminal_color_2 = colors.base0B
 vim.g.terminal_color_3 = colors.base0A
diff --git a/lua/base46/themes/aquarium.lua b/lua/base46/themes/aquarium.lua
index 8d4bce4..5fdc185 100644
--- a/lua/base46/themes/aquarium.lua
+++ b/lua/base46/themes/aquarium.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#eAc1c1",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "aquarium")
 
diff --git a/lua/base46/themes/ayu-dark.lua b/lua/base46/themes/ayu-dark.lua
index 137d422..f7c4f16 100644
--- a/lua/base46/themes/ayu-dark.lua
+++ b/lua/base46/themes/ayu-dark.lua
@@ -81,6 +81,6 @@ M.polish_hl = {
 
 M = require("base46").override_theme(M, "ayu-dark")
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 return M
diff --git a/lua/base46/themes/blossom.lua b/lua/base46/themes/blossom.lua
index c1bd431..0a2ae41 100644
--- a/lua/base46/themes/blossom.lua
+++ b/lua/base46/themes/blossom.lua
@@ -60,9 +60,14 @@ M.polish_hl = {
    WhichKey = {
       fg = M.base_30.white,
    },
+
+   TbLineThemeToggleBtn = {
+      fg = M.base_30.black,
+      bg = M.base_30.white,
+   },
 }
 
-M.type = "light"
+vim.opt.bg = "light"
 
 M = require("base46").override_theme(M, "blossom")
 
diff --git a/lua/base46/themes/catppuccin.lua b/lua/base46/themes/catppuccin.lua
index 5a3791a..d18ab17 100644
--- a/lua/base46/themes/catppuccin.lua
+++ b/lua/base46/themes/catppuccin.lua
@@ -67,7 +67,7 @@ M.polish_hl = {
    },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "catppuccin")
 
diff --git a/lua/base46/themes/chadracula.lua b/lua/base46/themes/chadracula.lua
index 28a68d4..b8c3711 100644
--- a/lua/base46/themes/chadracula.lua
+++ b/lua/base46/themes/chadracula.lua
@@ -63,7 +63,7 @@ M.polish_hl = {
    },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "chadracula")
 
diff --git a/lua/base46/themes/chadtain.lua b/lua/base46/themes/chadtain.lua
index 183294d..740cf07 100644
--- a/lua/base46/themes/chadtain.lua
+++ b/lua/base46/themes/chadtain.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#ac8a8c",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "chadtain")
 
diff --git a/lua/base46/themes/chocolate.lua b/lua/base46/themes/chocolate.lua
index daa9c3e..7ccfab9 100644
--- a/lua/base46/themes/chocolate.lua
+++ b/lua/base46/themes/chocolate.lua
@@ -94,7 +94,7 @@ M.polish_hl = {
    },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "chocolate")
 
diff --git a/lua/base46/themes/decay.lua b/lua/base46/themes/decay.lua
index b92c114..9310549 100644
--- a/lua/base46/themes/decay.lua
+++ b/lua/base46/themes/decay.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#e05f65",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "decay")
 
diff --git a/lua/base46/themes/doomchad.lua b/lua/base46/themes/doomchad.lua
index b2b548b..33ca84d 100644
--- a/lua/base46/themes/doomchad.lua
+++ b/lua/base46/themes/doomchad.lua
@@ -58,7 +58,7 @@ M.polish_hl = {
   }
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "doomchad")
 
diff --git a/lua/base46/themes/everforest.lua b/lua/base46/themes/everforest.lua
index 93d538f..05ce874 100644
--- a/lua/base46/themes/everforest.lua
+++ b/lua/base46/themes/everforest.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#e67e80",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M.polish_hl = {
    TSPunctBracket = {
diff --git a/lua/base46/themes/everforest_light.lua b/lua/base46/themes/everforest_light.lua
index 66e206f..2b14b06 100644
--- a/lua/base46/themes/everforest_light.lua
+++ b/lua/base46/themes/everforest_light.lua
@@ -84,9 +84,14 @@ M.polish_hl = {
    NvimTreeFolderName = {
       fg = "#4e565c",
    },
+
+   TbLineThemeToggleBtn = {
+      fg = M.base_30.black,
+      bg = M.base_30.white,
+   },
 }
 
-M.type = "light"
+vim.opt.bg = "light"
 
 M = require("base46").override_theme(M, "everforest_light")
 
diff --git a/lua/base46/themes/gatekeeper.lua b/lua/base46/themes/gatekeeper.lua
index a0718a4..efad385 100644
--- a/lua/base46/themes/gatekeeper.lua
+++ b/lua/base46/themes/gatekeeper.lua
@@ -57,7 +57,7 @@ M.polish_hl = {
    TSParameter = { fg = M.base_30.white },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "gatekeeper")
 
diff --git a/lua/base46/themes/gruvbox.lua b/lua/base46/themes/gruvbox.lua
index 6e98cf9..e2eda8a 100644
--- a/lua/base46/themes/gruvbox.lua
+++ b/lua/base46/themes/gruvbox.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#d65d0e",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "gruvbox")
 
diff --git a/lua/base46/themes/gruvbox_light.lua b/lua/base46/themes/gruvbox_light.lua
index 0f68a41..9b2dce3 100644
--- a/lua/base46/themes/gruvbox_light.lua
+++ b/lua/base46/themes/gruvbox_light.lua
@@ -52,7 +52,14 @@ M.base_16 = {
    base0F = "#d65d0e",
 }
 
-M.type = "light"
+vim.opt.bg = "light"
+
+M.polish_hl = {
+   TbLineThemeToggleBtn = {
+      fg = M.base_30.black,
+      bg = M.base_30.white,
+   },
+}
 
 M = require("base46").override_theme(M, "gruvbox_light")
 
diff --git a/lua/base46/themes/gruvchad.lua b/lua/base46/themes/gruvchad.lua
index 3092f5f..182e475 100644
--- a/lua/base46/themes/gruvchad.lua
+++ b/lua/base46/themes/gruvchad.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base06 = "#c3b499",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "gruvchad")
 
diff --git a/lua/base46/themes/jellybeans.lua b/lua/base46/themes/jellybeans.lua
index ecd6bb5..8dde47c 100644
--- a/lua/base46/themes/jellybeans.lua
+++ b/lua/base46/themes/jellybeans.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#cf6a4c",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "jellybeans")
 
diff --git a/lua/base46/themes/kanagawa.lua b/lua/base46/themes/kanagawa.lua
index 2da7d57..6d4bd39 100644
--- a/lua/base46/themes/kanagawa.lua
+++ b/lua/base46/themes/kanagawa.lua
@@ -66,7 +66,7 @@ M.polish_hl = {
    },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "kanagawa")
 
diff --git a/lua/base46/themes/monekai.lua b/lua/base46/themes/monekai.lua
index edf69a4..5e7811d 100644
--- a/lua/base46/themes/monekai.lua
+++ b/lua/base46/themes/monekai.lua
@@ -60,7 +60,7 @@ M.polish_hl = {
       fg = M.base_30.red,
    },
 }
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "monekai")
 
diff --git a/lua/base46/themes/mountain.lua b/lua/base46/themes/mountain.lua
index 5bab581..75fb253 100644
--- a/lua/base46/themes/mountain.lua
+++ b/lua/base46/themes/mountain.lua
@@ -59,7 +59,7 @@ M.polish_hl = {
 
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "mountain")
 
diff --git a/lua/base46/themes/nightfox.lua b/lua/base46/themes/nightfox.lua
index f93f152..8791265 100644
--- a/lua/base46/themes/nightfox.lua
+++ b/lua/base46/themes/nightfox.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#d85e7c",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "nightfox")
 
diff --git a/lua/base46/themes/nightlamp.lua b/lua/base46/themes/nightlamp.lua
index 57442a7..32db427 100644
--- a/lua/base46/themes/nightlamp.lua
+++ b/lua/base46/themes/nightlamp.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#90a0a0",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "nightlamp")
 
diff --git a/lua/base46/themes/nightowl.lua b/lua/base46/themes/nightowl.lua
index 91a8127..469ac93 100644
--- a/lua/base46/themes/nightowl.lua
+++ b/lua/base46/themes/nightowl.lua
@@ -70,7 +70,7 @@ M.polish_hl = {
    },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "nightowl")
 
diff --git a/lua/base46/themes/nord.lua b/lua/base46/themes/nord.lua
index 2d9fbeb..99af1f1 100644
--- a/lua/base46/themes/nord.lua
+++ b/lua/base46/themes/nord.lua
@@ -61,7 +61,7 @@ M.polish_hl = {
       fg = M.base_30.white,
    },
 }
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "nord")
 
diff --git a/lua/base46/themes/one_light.lua b/lua/base46/themes/one_light.lua
index 484e676..8b423bf 100644
--- a/lua/base46/themes/one_light.lua
+++ b/lua/base46/themes/one_light.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#986801",
 }
 
-M.type = "light"
+vim.opt.bg = "light"
 
 M.polish_hl = {
    WhichKeyDesc = {
@@ -88,19 +88,9 @@ M.polish_hl = {
       fg = M.base_16.base05,
    },
 
-   FelineDirName = {
+   TbLineThemeToggleBtn = {
       fg = M.base_30.black,
-      bg = M.base_30.nord_blue,
-   },
-
-   FelineDirName_Separator = {
-      fg = M.base_30.nord_blue,
-      bg = M.base_30.statusline_bg,
-   },
-
-   FelineFileName_Separator = {
-      fg = M.base_30.lightbg,
-      bg = M.base_30.nord_blue,
+      bg = M.base_30.white,
    },
 }
 
diff --git a/lua/base46/themes/onedark.lua b/lua/base46/themes/onedark.lua
index dc6be61..4ef234b 100644
--- a/lua/base46/themes/onedark.lua
+++ b/lua/base46/themes/onedark.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#be5046",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "onedark")
 
diff --git a/lua/base46/themes/onenord.lua b/lua/base46/themes/onenord.lua
index bf6e1e4..cfb1b99 100644
--- a/lua/base46/themes/onenord.lua
+++ b/lua/base46/themes/onenord.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#d57780",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "onenord")
 
diff --git a/lua/base46/themes/onenord_light.lua b/lua/base46/themes/onenord_light.lua
index 0de9868..b02b101 100644
--- a/lua/base46/themes/onenord_light.lua
+++ b/lua/base46/themes/onenord_light.lua
@@ -89,6 +89,6 @@ M.polish_hl = {
 
 M = require("base46").override_theme(M, "onenord_light")
 
-M.type = "light"
+vim.opt.bg = "light"
 
 return M
diff --git a/lua/base46/themes/palenight.lua b/lua/base46/themes/palenight.lua
index b781f9c..bf365c5 100644
--- a/lua/base46/themes/palenight.lua
+++ b/lua/base46/themes/palenight.lua
@@ -61,7 +61,7 @@ M.polish_hl = {
    },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "palenight")
 
diff --git a/lua/base46/themes/pastelDark.lua b/lua/base46/themes/pastelDark.lua
index d7c46c8..e9ac783 100644
--- a/lua/base46/themes/pastelDark.lua
+++ b/lua/base46/themes/pastelDark.lua
@@ -15,7 +15,7 @@ M.base_30 = {
    red = "#ef8891",
    baby_pink = "#fca2aa",
    pink = "#fca2af",
-   line = "#20272e", -- for lines like vertsplit
+   line = "#272e35", -- for lines like vertsplit
    green = "#9fe8c3",
    vibrant_green = "#9ce5c0",
    blue = "#99aee5",
@@ -52,7 +52,7 @@ M.base_16 = {
    base06 = "#d3d9e4",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "javacafe")
 
diff --git a/lua/base46/themes/radium.lua b/lua/base46/themes/radium.lua
index 9ee4f40..9e07301 100644
--- a/lua/base46/themes/radium.lua
+++ b/lua/base46/themes/radium.lua
@@ -62,7 +62,7 @@ M.polish_hl = {
    },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "radium")
 
diff --git a/lua/base46/themes/rosepine.lua b/lua/base46/themes/rosepine.lua
index 6fdd931..344df79 100644
--- a/lua/base46/themes/rosepine.lua
+++ b/lua/base46/themes/rosepine.lua
@@ -54,6 +54,6 @@ M.base_16 = {
 
 M = require("base46").override_theme(M, "rosepine")
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 return M
diff --git a/lua/base46/themes/rxyhn.lua b/lua/base46/themes/rxyhn.lua
index a282ab0..0d0b609 100644
--- a/lua/base46/themes/rxyhn.lua
+++ b/lua/base46/themes/rxyhn.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#F16269",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "rxyhn")
 
diff --git a/lua/base46/themes/tokyodark.lua b/lua/base46/themes/tokyodark.lua
index 36e3011..fac5f1a 100644
--- a/lua/base46/themes/tokyodark.lua
+++ b/lua/base46/themes/tokyodark.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base0F = "#f3627a",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "tokyodark")
 
diff --git a/lua/base46/themes/tokyonight.lua b/lua/base46/themes/tokyonight.lua
index 71495bb..4d0389a 100644
--- a/lua/base46/themes/tokyonight.lua
+++ b/lua/base46/themes/tokyonight.lua
@@ -58,7 +58,7 @@ M.polish_hl = {
    TSParameter = { fg = M.base_30.white },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "tokyonight")
 
diff --git a/lua/base46/themes/tomorrow_night.lua b/lua/base46/themes/tomorrow_night.lua
index 02f4adb..41b8a32 100644
--- a/lua/base46/themes/tomorrow_night.lua
+++ b/lua/base46/themes/tomorrow_night.lua
@@ -52,7 +52,7 @@ M.base_16 = {
    base06 = "#e0e0e0",
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M.polish_hl = {
    PmenuSel = {
diff --git a/lua/base46/themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua
index b83ef51..201649f 100644
--- a/lua/base46/themes/vscode_dark.lua
+++ b/lua/base46/themes/vscode_dark.lua
@@ -84,7 +84,7 @@ M.polish_hl = {
    },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "vscode_dark")
 
diff --git a/lua/base46/themes/wombat.lua b/lua/base46/themes/wombat.lua
index 8b5b476..a13215a 100644
--- a/lua/base46/themes/wombat.lua
+++ b/lua/base46/themes/wombat.lua
@@ -57,11 +57,9 @@ M.polish_hl = {
    TSConstructor = { fg = M.base_30.orange },
    TSVariable = { link = "TSConstructor" },
    TSConditional = { link = "TSInclude" },
-   Feline_LspIcon = { fg = M.base_30.teal },
-   FelineIcon = { bg = M.base_30.teal },
 }
 
-M.type = "dark"
+vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "wombat")