From 6852de99a71332b50df8328437216d29d312f83d Mon Sep 17 00:00:00 2001
From: siduck <siduck@tutanota.com>
Date: Sat, 28 Oct 2023 09:32:24 +0530
Subject: [PATCH] refactor polish_hl

this can be used to add new highlight groups now!
---
 lua/base46/init.lua                        |  29 +--
 lua/base46/integrations/cmp.lua            |   2 +-
 lua/base46/integrations/devicons.lua       |  12 +-
 lua/base46/integrations/nvchad_updater.lua |   2 +-
 lua/base46/integrations/syntax.lua         | 143 +++--------
 lua/base46/integrations/tbline.lua         |   2 +-
 lua/base46/integrations/treesitter.lua     | 273 +++++----------------
 lua/base46/integrations/trouble.lua        |  10 +-
 lua/base46/themes/ayu_dark.lua             |  14 +-
 lua/base46/themes/ayu_light.lua            |  14 +-
 lua/base46/themes/bearded-arc.lua          |  13 +-
 lua/base46/themes/blossom_light.lua        |  20 +-
 lua/base46/themes/catppuccin.lua           |   8 +-
 lua/base46/themes/chadracula.lua           |   8 +-
 lua/base46/themes/chocolate.lua            |  23 +-
 lua/base46/themes/dark_horizon.lua         |  19 +-
 lua/base46/themes/decay.lua                |   4 +-
 lua/base46/themes/doomchad.lua             |   6 +-
 lua/base46/themes/everforest.lua           |   7 +-
 lua/base46/themes/everforest_light.lua     |  44 +++-
 lua/base46/themes/falcon.lua               |  17 +-
 lua/base46/themes/gatekeeper.lua           |   6 +-
 lua/base46/themes/github_dark.lua          |  25 +-
 lua/base46/themes/github_light.lua         |  30 +--
 lua/base46/themes/gruvbox.lua              |   8 +-
 lua/base46/themes/gruvbox_light.lua        |   4 +-
 lua/base46/themes/kanagawa.lua             |  25 +-
 lua/base46/themes/melange.lua              |  25 +-
 lua/base46/themes/monekai.lua              |  19 +-
 lua/base46/themes/monochrome.lua           |   4 +-
 lua/base46/themes/mountain.lua             |   4 +-
 lua/base46/themes/nightfox.lua             |  10 +-
 lua/base46/themes/nightowl.lua             |   9 +-
 lua/base46/themes/nord.lua                 |   6 +-
 lua/base46/themes/oceanic-light.lua        |  17 +-
 lua/base46/themes/oceanic-next.lua         |   9 +-
 lua/base46/themes/one_light.lua            |  33 ++-
 lua/base46/themes/onenord_light.lua        |  31 ++-
 lua/base46/themes/oxocarbon.lua            |   9 +-
 lua/base46/themes/palenight.lua            |   6 +-
 lua/base46/themes/penumbra_dark.lua        |  38 +--
 lua/base46/themes/penumbra_light.lua       |  28 +--
 lua/base46/themes/purify.lua               |  62 -----
 lua/base46/themes/radium.lua               |   6 +-
 lua/base46/themes/tokyonight.lua           |  14 +-
 lua/base46/themes/tomorrow_night.lua       |   4 +-
 lua/base46/themes/tundra.lua               |  47 +---
 lua/base46/themes/vscode_dark.lua          |  14 +-
 lua/base46/themes/wombat.lua               |   4 +-
 49 files changed, 431 insertions(+), 736 deletions(-)
 delete mode 100644 lua/base46/themes/purify.lua

diff --git a/lua/base46/init.lua b/lua/base46/init.lua
index 088b824..f46f0a2 100644
--- a/lua/base46/init.lua
+++ b/lua/base46/init.lua
@@ -43,26 +43,12 @@ M.turn_str_to_color = function(tb)
   return copy
 end
 
-M.extend_default_hl = function(highlights)
+M.extend_default_hl = function(highlights, integration_name)
   local polish_hl = M.get_theme_tb "polish_hl"
-  local add_hl = M.get_theme_tb "add_hl"
 
   -- polish themes
-  if polish_hl then
-    for key, value in pairs(polish_hl) do
-      if highlights[key] then
-        highlights[key] = M.merge_tb(highlights[key], value)
-      end
-    end
-  end
-
-  -- add new hl
-  if add_hl then
-    for key, value in pairs(add_hl) do
-      if not highlights[key] and type(value) == "table" then
-        highlights[key] = value
-      end
-    end
+  if polish_hl[integration_name] then
+    highlights = M.merge_tb(highlights, polish_hl[integration_name])
   end
 
   -- transparency
@@ -85,12 +71,13 @@ M.extend_default_hl = function(highlights)
       end
     end
   end
+
+  return highlights
 end
 
-M.load_integrationTB = function(group)
-  group = require("base46.integrations." .. group)
-  M.extend_default_hl(group)
-  return group
+M.load_integrationTB = function(name)
+  local highlights = require("base46.integrations." .. name)
+  return M.extend_default_hl(highlights, name)
 end
 
 -- convert table into string
diff --git a/lua/base46/integrations/cmp.lua b/lua/base46/integrations/cmp.lua
index 72a6d47..f03bcab 100644
--- a/lua/base46/integrations/cmp.lua
+++ b/lua/base46/integrations/cmp.lua
@@ -42,7 +42,7 @@ local item_kinds = {
   CmpItemKindTypeParameter = { fg = base16.base08 },
   CmpItemKindCopilot = { fg = colors.green },
   CmpItemKindCodeium = { fg = colors.vibrant_green },
-  CmpItemKindTabNine = {fg = colors.baby_pink },
+  CmpItemKindTabNine = { fg = colors.baby_pink },
 }
 
 local cmp_ui = require("nvconfig").ui.cmp
diff --git a/lua/base46/integrations/devicons.lua b/lua/base46/integrations/devicons.lua
index d3234f8..450e204 100644
--- a/lua/base46/integrations/devicons.lua
+++ b/lua/base46/integrations/devicons.lua
@@ -28,10 +28,10 @@ return {
   DevIconxz = { fg = colors.sun },
   DevIconzip = { fg = colors.sun },
   DevIconZig = { fg = colors.orange },
-  DevIconMd = {fg = colors.blue},
-  DevIconTSX = {fg = colors.blue},
-  DevIconJSX = {fg = colors.blue},
-  DevIconSvelte = {fg = colors.red},
-  DevIconJava = {fg = colors.orange},
-  DevIconDart = {fg = colors.cyan}
+  DevIconMd = { fg = colors.blue },
+  DevIconTSX = { fg = colors.blue },
+  DevIconJSX = { fg = colors.blue },
+  DevIconSvelte = { fg = colors.red },
+  DevIconJava = { fg = colors.orange },
+  DevIconDart = { fg = colors.cyan },
 }
diff --git a/lua/base46/integrations/nvchad_updater.lua b/lua/base46/integrations/nvchad_updater.lua
index cdd081d..f69054b 100644
--- a/lua/base46/integrations/nvchad_updater.lua
+++ b/lua/base46/integrations/nvchad_updater.lua
@@ -10,5 +10,5 @@ return {
   nvUpdaterProgressFAIL = { fg = colors.red, bg = colors.one_bg2 },
 
   nvUpdaterCommits = { fg = colors.green },
-  nvUpdaterFAIL = { fg = colors.red},
+  nvUpdaterFAIL = { fg = colors.red },
 }
diff --git a/lua/base46/integrations/syntax.lua b/lua/base46/integrations/syntax.lua
index 7291681..34f9a4b 100644
--- a/lua/base46/integrations/syntax.lua
+++ b/lua/base46/integrations/syntax.lua
@@ -1,120 +1,33 @@
 local theme = require("base46").get_theme_tb "base_16"
 
 local syntax = {
-  Boolean = {
-    fg = theme.base09,
-  },
-
-  Character = {
-    fg = theme.base08,
-  },
-
-  Conditional = {
-    fg = theme.base0E,
-  },
-
-  Constant = {
-    fg = theme.base08,
-  },
-
-  Define = {
-    fg = theme.base0E,
-    sp = "none",
-  },
-
-  Delimiter = {
-    fg = theme.base0F,
-  },
-
-  Float = {
-    fg = theme.base09,
-  },
-
-  Variable = {
-    fg = theme.base05,
-  },
-
-  Function = {
-    fg = theme.base0D,
-  },
-
-  Identifier = {
-    fg = theme.base08,
-    sp = "none",
-  },
-
-  Include = {
-    fg = theme.base0D,
-  },
-
-  Keyword = {
-    fg = theme.base0E,
-  },
-
-  Label = {
-    fg = theme.base0A,
-  },
-
-  Number = {
-    fg = theme.base09,
-  },
-
-  Operator = {
-    fg = theme.base05,
-    sp = "none",
-  },
-
-  PreProc = {
-    fg = theme.base0A,
-  },
-
-  Repeat = {
-    fg = theme.base0A,
-  },
-
-  Special = {
-    fg = theme.base0C,
-  },
-
-  SpecialChar = {
-    fg = theme.base0F,
-  },
-
-  Statement = {
-    fg = theme.base08,
-  },
-
-  StorageClass = {
-    fg = theme.base0A,
-  },
-
-  String = {
-    fg = theme.base0B,
-  },
-
-  Structure = {
-    fg = theme.base0E,
-  },
-
-  Tag = {
-    fg = theme.base0A,
-  },
-
-  Todo = {
-    fg = theme.base0A,
-    bg = theme.base01,
-  },
-
-  Type = {
-    fg = theme.base0A,
-    sp = "none",
-  },
-
-  Typedef = {
-    fg = theme.base0A,
-  },
+  Boolean = { fg = theme.base09 },
+  Character = { fg = theme.base08 },
+  Conditional = { fg = theme.base0E },
+  Constant = { fg = theme.base08 },
+  Define = { fg = theme.base0E, sp = "none" },
+  Delimiter = { fg = theme.base0F },
+  Float = { fg = theme.base09 },
+  Variable = { fg = theme.base05 },
+  Function = { fg = theme.base0D },
+  Identifier = { fg = theme.base08, sp = "none" },
+  Include = { fg = theme.base0D },
+  Keyword = { fg = theme.base0E },
+  Label = { fg = theme.base0A },
+  Number = { fg = theme.base09 },
+  Operator = { fg = theme.base05, sp = "none" },
+  PreProc = { fg = theme.base0A },
+  Repeat = { fg = theme.base0A },
+  Special = { fg = theme.base0C },
+  SpecialChar = { fg = theme.base0F },
+  Statement = { fg = theme.base08 },
+  StorageClass = { fg = theme.base0A },
+  String = { fg = theme.base0B },
+  Structure = { fg = theme.base0E },
+  Tag = { fg = theme.base0A },
+  Todo = { fg = theme.base0A, bg = theme.base01 },
+  Type = { fg = theme.base0A, sp = "none" },
+  Typedef = { fg = theme.base0A },
 }
 
-local merge_tb = require("base46").merge_tb
-
-return merge_tb(syntax, require("base46").load_integrationTB "treesitter")
+return syntax
diff --git a/lua/base46/integrations/tbline.lua b/lua/base46/integrations/tbline.lua
index 2c67463..17b6cdd 100644
--- a/lua/base46/integrations/tbline.lua
+++ b/lua/base46/integrations/tbline.lua
@@ -85,7 +85,7 @@ local hlgroups_glassy = {
   "TbLineBufOnClose",
   "TbLineBufOffClose",
   "TbLineBufOnModified",
-  "TbLineBufOffModified"
+  "TbLineBufOffModified",
 }
 
 if config.transparency then
diff --git a/lua/base46/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua
index b610de0..a7a465a 100644
--- a/lua/base46/integrations/treesitter.lua
+++ b/lua/base46/integrations/treesitter.lua
@@ -1,222 +1,59 @@
 local theme = require("base46").get_theme_tb "base_16"
+local base30 = require("base46").get_theme_tb "base_30"
 
 return {
-  -- `@annotation` is not one of the default capture group, should we keep it
-  ["@annotation"] = {
-    fg = theme.base0F,
-  },
-
-  ["@attribute"] = {
-    fg = theme.base0A,
-  },
-
-  ["@character"] = {
-    fg = theme.base08,
-  },
-
-  ["@constructor"] = {
-    fg = theme.base0C,
-  },
-
-  ["@constant"] = {
-    fg = theme.base08,
-  },
-
-  ["@constant.builtin"] = {
-    fg = theme.base09,
-  },
-
-  ["@constant.macro"] = {
-    fg = theme.base08,
-  },
-
-  ["@error"] = {
-    fg = theme.base08,
-  },
-
-  ["@exception"] = {
-    fg = theme.base08,
-  },
-
-  ["@float"] = {
-    fg = theme.base09,
-  },
-
-  ["@keyword"] = {
-    fg = theme.base0E,
-  },
-
-  ["@keyword.function"] = {
-    fg = theme.base0E,
-  },
-
-  ["@keyword.return"] = {
-    fg = theme.base0E,
-  },
-
-  ["@function"] = {
-    fg = theme.base0D,
-  },
-
-  ["@function.builtin"] = {
-    fg = theme.base0D,
-  },
-
-  ["@function.macro"] = {
-    fg = theme.base08,
-  },
-
-  ["@function.call"] = {
-    fg = theme.base0D,
-  },
-
-  ["@operator"] = {
-    fg = theme.base05,
-  },
-
-  ["@keyword.operator"] = {
-    fg = theme.base0E,
-  },
-
-  ["@method"] = {
-    fg = theme.base0D,
-  },
-
-  ["@method.call"] = {
-    fg = theme.base0D,
-  },
-
-  ["@namespace"] = {
-    fg = theme.base08,
-  },
-
-  ["@none"] = {
-    fg = theme.base05,
-  },
-
-  ["@parameter"] = {
-    fg = theme.base08,
-  },
-
-  ["@reference"] = {
-    fg = theme.base05,
-  },
-
-  ["@punctuation.bracket"] = {
-    fg = theme.base0F,
-  },
-
-  ["@punctuation.delimiter"] = {
-    fg = theme.base0F,
-  },
-
-  ["@punctuation.special"] = {
-    fg = theme.base08,
-  },
-
-  ["@string"] = {
-    fg = theme.base0B,
-  },
-
-  ["@string.regex"] = {
-    fg = theme.base0C,
-  },
-
-  ["@string.escape"] = {
-    fg = theme.base0C,
-  },
-
-  ["@string.special"] = {
-    fg = theme.base0C,
-  },
-
-  ["@symbol"] = {
-    fg = theme.base0B,
-  },
-
-  ["@tag"] = {
-    link = "Tag",
-  },
-
-  ["@tag.attribute"] = {
-    link = "@property",
-  },
-
-  ["@tag.delimiter"] = {
-    fg = theme.base0F,
-  },
-
-  ["@text"] = {
-    fg = theme.base05,
-  },
-
-  ["@text.strong"] = {
-    bold = true,
-  },
-
-  ["@text.emphasis"] = {
-    fg = theme.base09,
-  },
-
-  ["@text.strike"] = {
-    fg = theme.base0F,
-    strikethrough = true,
-  },
-
-  ["@text.literal"] = {
-    fg = theme.base09,
-  },
-
-  ["@text.uri"] = {
-    fg = theme.base09,
-    underline = true,
-  },
-
-  ["@type.builtin"] = {
-    fg = theme.base0A,
-  },
-
-  ["@variable"] = {
-    fg = theme.base05,
-  },
-
-  ["@variable.builtin"] = {
-    fg = theme.base09,
-  },
-
-  -- variable.global
-
-  ["@definition"] = {
-    sp = theme.base04,
-    underline = true,
-  },
-
-  -- TSDefinitionUsage = {
-  --   sp = theme.base04,
-  --   underline = true,
-  -- },
-
-  ["@scope"] = {
-    bold = true,
-  },
-
-  ["@field"] = {
-    fg = theme.base08,
-  },
-
-  ["@field.key"] = {
-    fg = theme.base08,
-  },
-
-  ["@property"] = {
-    fg = theme.base08,
-  },
-
-  ["@include"] = {
-    link = "Include",
-  },
-
-  ["@conditional"] = {
-    link = "Conditional",
-  },
+  ["@annotation"] = { fg = theme.base0F },
+  ["@attribute"] = { fg = theme.base0A },
+  ["@character"] = { fg = theme.base08 },
+  ["@constructor"] = { fg = theme.base0C },
+  ["@constant"] = { fg = theme.base08 },
+  ["@constant.builtin"] = { fg = theme.base09 },
+  ["@constant.macro"] = { fg = theme.base08 },
+  ["@error"] = { fg = theme.base08 },
+  ["@exception"] = { fg = theme.base08 },
+  ["@float"] = { fg = theme.base09 },
+  ["@keyword"] = { fg = theme.base0E },
+  ["@keyword.function"] = { fg = theme.base0E },
+  ["@keyword.return"] = { fg = theme.base0E },
+  ["@function"] = { fg = theme.base0D },
+  ["@function.builtin"] = { fg = theme.base0D },
+  ["@function.macro"] = { fg = theme.base08 },
+  ["@function.call"] = { fg = theme.base0D },
+  ["@operator"] = { fg = theme.base05 },
+  ["@keyword.operator"] = { fg = theme.base0E },
+  ["@method"] = { fg = theme.base0D },
+  ["@method.call"] = { fg = theme.base0D },
+  ["@namespace"] = { fg = theme.base08 },
+  ["@none"] = { fg = theme.base05 },
+  ["@parameter"] = { fg = theme.base08 },
+  ["@reference"] = { fg = theme.base05 },
+  ["@punctuation.bracket"] = { fg = theme.base0F },
+  ["@punctuation.delimiter"] = { fg = theme.base0F },
+  ["@punctuation.special"] = { fg = theme.base08 },
+  ["@string"] = { fg = theme.base0B },
+  ["@string.regex"] = { fg = theme.base0C },
+  ["@string.escape"] = { fg = theme.base0C },
+  ["@string.special"] = { fg = theme.base0C },
+  ["@symbol"] = { fg = theme.base0B },
+  ["@tag"] = { fg = theme.base0A },
+  ["@tag.attribute"] = { fg = theme.base08 },
+  ["@tag.delimiter"] = { fg = theme.base0F },
+  ["@text"] = { fg = theme.base05 },
+  ["@text.strong"] = { bold = true },
+  ["@text.emphasis"] = { fg = theme.base09 },
+  ["@text.strike"] = { fg = theme.base0F, strikethrough = true },
+  ["@text.literal"] = { fg = theme.base09 },
+  ["@text.uri"] = { fg = theme.base09, underline = true },
+  ["@type.builtin"] = { fg = theme.base0A },
+  ["@variable"] = { fg = theme.base05 },
+  ["@variable.builtin"] = { fg = theme.base09 },
+  ["@definition"] = { sp = theme.base04, underline = true },
+  ["@scope"] = { bold = true },
+  ["@field"] = { fg = theme.base08 },
+  ["@field.key"] = { fg = theme.base08 },
+  ["@property"] = { fg = theme.base08 },
+  ["@include"] = { link = "Include" },
+  ["@conditional"] = { fg = theme.base0E },
+  ["@conditional.ternary"] = { fg = theme.base0E },
+  ["@comment"] = { fg = base30.grey_fg },
 }
diff --git a/lua/base46/integrations/trouble.lua b/lua/base46/integrations/trouble.lua
index 95441d8..6b78b2b 100644
--- a/lua/base46/integrations/trouble.lua
+++ b/lua/base46/integrations/trouble.lua
@@ -4,23 +4,23 @@ return {
   TroubleCount = { fg = colors.pink },
   TroubleCode = { fg = colors.white },
   TroubleWarning = { fg = colors.orange },
-  TroubleSignWarning = { link = "DiagnosticWarn"},
+  TroubleSignWarning = { link = "DiagnosticWarn" },
   TroubleTextWarning = { fg = colors.white },
   TroublePreview = { fg = colors.red },
   TroubleSource = { fg = colors.cyan },
-  TroubleSignHint = { link = "DiagnosticHint"},
+  TroubleSignHint = { link = "DiagnosticHint" },
   TroubleTextHint = { fg = colors.white },
   TroubleHint = { fg = colors.orange },
-  TroubleSignOther = { link = "DiagnosticNormal"},
+  TroubleSignOther = { link = "DiagnosticNormal" },
   TroubleSignInformation = { fg = colors.white },
   TroubleTextInformation = { fg = colors.white },
   TroubleInformation = { fg = colors.white },
   TroubleError = { fg = colors.red },
   TroubleTextError = { fg = colors.white },
-  TroubleSignError = { link = "DiagnosticError"},
+  TroubleSignError = { link = "DiagnosticError" },
   TroubleText = { fg = colors.white },
   TroubleFile = { fg = colors.yellow },
-  TroubleFoldIcon = { link = "Folded"},
+  TroubleFoldIcon = { link = "Folded" },
   TroubleNormal = { fg = colors.white },
   TroubleLocation = { fg = colors.red },
   TroubleIndent = { link = colors.Comment },
diff --git a/lua/base46/themes/ayu_dark.lua b/lua/base46/themes/ayu_dark.lua
index 3f2c35e..2a17632 100644
--- a/lua/base46/themes/ayu_dark.lua
+++ b/lua/base46/themes/ayu_dark.lua
@@ -56,12 +56,14 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  luaTSField = { fg = M.base_16.base0D },
-  ["@tag.delimiter"] = { fg = M.base_30.cyan },
-  ["@function"] = { fg = M.base_30.orange },
-  ["@parameter"] = { fg = M.base_16.base0F },
-  ["@constructor"] = { fg = M.base_16.base0A },
-  ["@tag.attribute"] = { fg = M.base_30.orange },
+  treesitter = {
+    luaTSField = { fg = M.base_16.base0D },
+    ["@tag.delimiter"] = { fg = M.base_30.cyan },
+    ["@function"] = { fg = M.base_30.orange },
+    ["@parameter"] = { fg = M.base_16.base0F },
+    ["@constructor"] = { fg = M.base_16.base0A },
+    ["@tag.attribute"] = { fg = M.base_30.orange },
+  },
 }
 
 M = require("base46").override_theme(M, "ayu_dark")
diff --git a/lua/base46/themes/ayu_light.lua b/lua/base46/themes/ayu_light.lua
index 51aba0f..3e25c11 100644
--- a/lua/base46/themes/ayu_light.lua
+++ b/lua/base46/themes/ayu_light.lua
@@ -56,12 +56,14 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  luaTSField = { fg = M.base_16.base0E },
-  PmenuSel = { fg = M.base_30.white, bg = M.base_30.pmenu_bg },
-  ["@tag.delimiter"] = { fg = M.base_30.base0D },
-  ["@parameter"] = { fg = M.base_16.base09 },
-  ["@constructor"] = { fg = M.base_16.base0C },
-  ["@tag.attribute"] = { fg = M.base_30.base0F },
+  treesitter = {
+    luaTSField = { fg = M.base_16.base0E },
+    PmenuSel = { fg = M.base_30.white, bg = M.base_30.pmenu_bg },
+    ["@tag.delimiter"] = { fg = M.base_30.base0D },
+    ["@parameter"] = { fg = M.base_16.base09 },
+    ["@constructor"] = { fg = M.base_16.base0C },
+    ["@tag.attribute"] = { fg = M.base_30.base0F },
+  },
 }
 
 M = require("base46").override_theme(M, "ayu_light")
diff --git a/lua/base46/themes/bearded-arc.lua b/lua/base46/themes/bearded-arc.lua
index 2d6ba75..2ccb979 100644
--- a/lua/base46/themes/bearded-arc.lua
+++ b/lua/base46/themes/bearded-arc.lua
@@ -58,17 +58,10 @@ M.base_16 = {
 M.type = "dark"
 
 M.polish_hl = {
-  Conditional = {
-    fg = M.base_30.yellow,
+  treesitter = {
+    ["@parameter"] = { fg = M.base_30.pink },
+    ["@attribute"] = { fg = M.base_30.purple },
   },
-
-  ["@parameter"] = {
-    fg = M.base_30.pink,
-  },
-
-  ["@attribute"] = {
-    fg = M.base_30.purple
-  }
 }
 
 M = require("base46").override_theme(M, "bearded-arc")
diff --git a/lua/base46/themes/blossom_light.lua b/lua/base46/themes/blossom_light.lua
index 2c9a9ef..88bd2d0 100644
--- a/lua/base46/themes/blossom_light.lua
+++ b/lua/base46/themes/blossom_light.lua
@@ -56,16 +56,22 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  WhichKeyDesc = { fg = M.base_30.white },
-  WhichKey = { fg = M.base_30.white },
+  whichkey = {
+    WhichKeyDesc = { fg = M.base_30.white },
+    WhichKey = { fg = M.base_30.white },
+  },
 
-  TbLineThemeToggleBtn = {
-    fg = M.base_30.black,
-    bg = M.base_30.white,
+  tbline = {
+    TbLineThemeToggleBtn = {
+      fg = M.base_30.black,
+      bg = M.base_30.white,
+    },
   },
 
-  IndentBlanklineContextStart = { bg = M.base_30.black2 },
-  St_pos_text = { fg = M.base_30.white },
+  -- IndentBlanklineContextStart = { bg = M.base_30.black2 },
+  statusline = {
+    St_pos_text = { fg = M.base_30.white },
+  },
 }
 
 M.type = "light"
diff --git a/lua/base46/themes/catppuccin.lua b/lua/base46/themes/catppuccin.lua
index 161fd1d..834acce 100644
--- a/lua/base46/themes/catppuccin.lua
+++ b/lua/base46/themes/catppuccin.lua
@@ -54,9 +54,11 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@variable"] = { fg = M.base_30.lavender },
-  ["@property"] = { fg = M.base_30.teal },
-  ["@variable.builtin"] = { fg = M.base_30.red },
+  treesitter = {
+    ["@variable"] = { fg = M.base_30.lavender },
+    ["@property"] = { fg = M.base_30.teal },
+    ["@variable.builtin"] = { fg = M.base_30.red },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/chadracula.lua b/lua/base46/themes/chadracula.lua
index cb58121..7dfe140 100644
--- a/lua/base46/themes/chadracula.lua
+++ b/lua/base46/themes/chadracula.lua
@@ -1,5 +1,5 @@
 -- Credits to original theme https://github.com/dracula/vim
--- This is a modified version 
+-- This is a modified version
 
 local M = {}
 
@@ -56,8 +56,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@function.builtin"] = { fg = M.base_30.cyan },
-  ["@number"] = { fg = M.base_30.purple },
+  treesiter = {
+    ["@function.builtin"] = { fg = M.base_30.cyan },
+    ["@number"] = { fg = M.base_30.purple },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/chocolate.lua b/lua/base46/themes/chocolate.lua
index 7f2c02a..b3011bb 100644
--- a/lua/base46/themes/chocolate.lua
+++ b/lua/base46/themes/chocolate.lua
@@ -57,15 +57,20 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@field"] = { fg = M.base_30.purple },
-  ["@variable"] = { fg = M.base_16.base06 },
-  ["@module"] = { fg = M.base_30.beige },
-  Operator = { fg = M.base_30.blue },
-  ["@attribute"] = { fg = M.base_30.cyan },
-  ["@punctuation.bracket"] = { fg = M.base_16.base06 },
-  ["@parenthesis"] = { link = "@punctuation.bracket" },
-  ["@parameter"] = { fg = M.base_30.green },
-  ["@function.builtin"] = { fg = M.base_30.yellow },
+  syntax = {
+    Operator = { fg = M.base_30.blue },
+  },
+
+  treesitter = {
+    ["@field"] = { fg = M.base_30.purple },
+    ["@variable"] = { fg = M.base_16.base06 },
+    ["@module"] = { fg = M.base_30.beige },
+    ["@attribute"] = { fg = M.base_30.cyan },
+    ["@punctuation.bracket"] = { fg = M.base_16.base06 },
+    ["@parenthesis"] = { link = "@punctuation.bracket" },
+    ["@parameter"] = { fg = M.base_30.green },
+    ["@function.builtin"] = { fg = M.base_30.yellow },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua
index 4f41510..7731ae3 100644
--- a/lua/base46/themes/dark_horizon.lua
+++ b/lua/base46/themes/dark_horizon.lua
@@ -1,5 +1,5 @@
--- Credits to original theme https://github.com/michael-ball/base16-horizon-scheme 
--- This is a modified version 
+-- Credits to original theme https://github.com/michael-ball/base16-horizon-scheme
+-- This is a modified version
 
 local M = {}
 
@@ -57,11 +57,16 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  Include = { fg = M.base_16.base0E, bold = true },
-  ["@property"] = { fg = M.base_16.base0E },
-  ["@tag.delimiter"] = { fg = M.base_16.base05 },
-  ["@punctuation.bracket"] = { fg = M.base_30.yellow },
-  ["@punctuation.delimiter"] = { fg = M.base_30.yellow },
+  syntax = {
+    Include = { fg = M.base_16.base0E, bold = true },
+  },
+
+  treesitter = {
+    ["@property"] = { fg = M.base_16.base0E },
+    ["@tag.delimiter"] = { fg = M.base_16.base05 },
+    ["@punctuation.bracket"] = { fg = M.base_30.yellow },
+    ["@punctuation.delimiter"] = { fg = M.base_30.yellow },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/decay.lua b/lua/base46/themes/decay.lua
index 165afe9..afa936e 100644
--- a/lua/base46/themes/decay.lua
+++ b/lua/base46/themes/decay.lua
@@ -56,8 +56,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@constant"] = {
-    fg = M.base_30.yellow,
+  treesitter = {
+    ["@constant"] = { fg = M.base_30.yellow },
   },
 }
 
diff --git a/lua/base46/themes/doomchad.lua b/lua/base46/themes/doomchad.lua
index 4e9f09c..5af56e5 100644
--- a/lua/base46/themes/doomchad.lua
+++ b/lua/base46/themes/doomchad.lua
@@ -56,8 +56,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@field"] = { fg = M.base_30.blue },
-  ["@punctuation.bracket"] = { fg = M.base_30.yellow },
+  treesitter = {
+    ["@field"] = { fg = M.base_30.blue },
+    ["@punctuation.bracket"] = { fg = M.base_30.yellow },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/everforest.lua b/lua/base46/themes/everforest.lua
index e81db4f..c4ee0ef 100644
--- a/lua/base46/themes/everforest.lua
+++ b/lua/base46/themes/everforest.lua
@@ -55,12 +55,13 @@ M.base_16 = {
   base0F = "#d699b6",
 }
 
-
 M.type = "dark"
 
 M.polish_hl = {
-  ["@tag"] = { fg = M.base_30.orange },
-  ["@tag.delimiter"] = { fg = M.base_30.green },
+  treesitter = {
+    ["@tag"] = { fg = M.base_30.orange },
+    ["@tag.delimiter"] = { fg = M.base_30.green },
+  },
 }
 
 M = require("base46").override_theme(M, "everforest")
diff --git a/lua/base46/themes/everforest_light.lua b/lua/base46/themes/everforest_light.lua
index 272b259..4073f93 100644
--- a/lua/base46/themes/everforest_light.lua
+++ b/lua/base46/themes/everforest_light.lua
@@ -56,18 +56,38 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  DiffAdd = { fg = M.base_30.green },
-  WhichKeyDesc = { fg = M.base_30.white },
-  WhichKey = { fg = M.base_30.white },
-  NvimTreeFolderName = { fg = "#4e565c" },
-  TbLineThemeToggleBtn = { bg = M.base_30.one_bg },
-  Pmenu = { bg = M.base_30.black2 },
-  IndentBlanklineContextStart = { bg = M.base_30.black2 },
-  St_pos_text = { fg = M.base_30.white },
-  ["@tag"] = { fg = M.base_30.orange },
-  ["@field"] = { fg = M.base_16.base05 },
-  ["@include"] = { fg = M.base_16.base08 },
-  ["@constructor"] = { fg = M.base_30.blue },
+  git = {
+    DiffAdd = { fg = M.base_30.green },
+  },
+
+  whichkey = {
+    WhichKeyDesc = { fg = M.base_30.white },
+    WhichKey = { fg = M.base_30.white },
+  },
+
+  nvimtree = {
+    NvimTreeFolderName = { fg = "#4e565c" },
+  },
+
+  tbline = {
+    TbLineThemeToggleBtn = { bg = M.base_30.one_bg },
+  },
+
+  defaults = {
+    Pmenu = { bg = M.base_30.black2 },
+  },
+  -- IndentBlanklineContextStart = { bg = M.base_30.black2 },
+
+  statusline = {
+    St_pos_text = { fg = M.base_30.white },
+  },
+
+  treesitter = {
+    ["@tag"] = { fg = M.base_30.orange },
+    ["@field"] = { fg = M.base_16.base05 },
+    ["@include"] = { fg = M.base_16.base08 },
+    ["@constructor"] = { fg = M.base_30.blue },
+  },
 }
 
 M.type = "light"
diff --git a/lua/base46/themes/falcon.lua b/lua/base46/themes/falcon.lua
index fd42f16..514c87d 100644
--- a/lua/base46/themes/falcon.lua
+++ b/lua/base46/themes/falcon.lua
@@ -58,12 +58,17 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  Statement = { fg = M.base_30.purple },
-  Type = { fg = M.base_30.white2 },
-  Include = { fg = M.base_30.tan },
-  Keyword = { fg = M.base_16.base0D },
-  Operator = { fg = M.base_30.red },
-  ["@keyword"] = { fg = M.base_16.base0D },
+  syntax = {
+    Statement = { fg = M.base_30.purple },
+    Type = { fg = M.base_30.white2 },
+    Include = { fg = M.base_30.tan },
+    Keyword = { fg = M.base_16.base0D },
+    Operator = { fg = M.base_30.red },
+  },
+
+  treesitter = {
+    ["@keyword"] = { fg = M.base_16.base0D },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/gatekeeper.lua b/lua/base46/themes/gatekeeper.lua
index 8b01534..15a2659 100644
--- a/lua/base46/themes/gatekeeper.lua
+++ b/lua/base46/themes/gatekeeper.lua
@@ -53,8 +53,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@variable"] = { fg = M.base_30.orange },
-  ["@parameter"] = { fg = M.base_30.white },
+  treesitter = {
+    ["@variable"] = { fg = M.base_30.orange },
+    ["@parameter"] = { fg = M.base_30.white },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/github_dark.lua b/lua/base46/themes/github_dark.lua
index 0f2855b..56d7a53 100644
--- a/lua/base46/themes/github_dark.lua
+++ b/lua/base46/themes/github_dark.lua
@@ -58,25 +58,12 @@ M.base_16 = {
 M.type = "dark"
 
 M.polish_hl = {
-  ["@punctuation.bracket"] = {
-    fg = M.base_30.orange,
-  },
-
-  ["@string"] = {
-    fg = M.base_30.white,
-  },
-
-  ["@field.key"] = {
-    fg = M.base_30.white,
-  },
-
-  ["@constructor"] = {
-    fg = M.base_30.vibrant_green,
-    bold = true,
-  },
-
-  ["@tag.attribute"] = {
-    link = "@method",
+  treesitter = {
+    ["@punctuation.bracket"] = { fg = M.base_30.orange },
+    ["@string"] = { fg = M.base_30.white },
+    ["@field.key"] = { fg = M.base_30.white },
+    ["@constructor"] = { fg = M.base_30.vibrant_green },
+    ["@tag.attribute"] = { link = "@method" },
   },
 }
 
diff --git a/lua/base46/themes/github_light.lua b/lua/base46/themes/github_light.lua
index 28c0a3f..a5d6af6 100644
--- a/lua/base46/themes/github_light.lua
+++ b/lua/base46/themes/github_light.lua
@@ -19,7 +19,7 @@ M.base_30 = {
   baby_pink = "#ea4aaa",
   pink = "#b93a86",
   line = "#eaecee", -- for lines like vertsplit
-  green = "#18654B", 
+  green = "#18654B",
   vibrant_green = "#28a745",
   nord_blue = "#0366d6", -- Mode indicator
   blue = "#0D7FDD",
@@ -58,29 +58,17 @@ M.base_16 = {
 M.type = "light"
 
 M.polish_hl = {
-  ["@punctuation.bracket"] = {
-    fg = M.base_30.blue,
+  treesitter = {
+    ["@punctuation.bracket"] = { fg = M.base_30.blue },
+    ["@field.key"] = { fg = M.base_30.white },
+    ["@constructor"] = { fg = M.base_30.vibrant_green },
+    ["@operator"] = { fg = M.base_30.orange },
   },
 
-  ["@field.key"] = {
-    fg = M.base_30.white,
+  syntax = {
+    Constant = { fg = M.base_16.base07 },
+    Tag = { fg = M.base_30.vibrant_green },
   },
-
-  Constant = {
-    fg = M.base_16.base07,
-  },
-
-  ["@constructor"] = {
-    fg = M.base_30.vibrant_green,
-  },
-
-  Tag = {
-    fg = M.base_30.vibrant_green,
-  },
-
-  ["@operator"] = {
-    fg = M.base_30.orange
-  }
 }
 
 M = require("base46").override_theme(M, "github_light")
diff --git a/lua/base46/themes/gruvbox.lua b/lua/base46/themes/gruvbox.lua
index 098e79b..2c9db60 100644
--- a/lua/base46/themes/gruvbox.lua
+++ b/lua/base46/themes/gruvbox.lua
@@ -60,12 +60,12 @@ M.type = "dark"
 M = require("base46").override_theme(M, "gruvbox")
 
 M.polish_hl = {
-  Operator = {
-    fg = M.base_30.nord_blue,
+  syntax = {
+    Operator = { fg = M.base_30.nord_blue },
   },
 
-  ["@operator"] = {
-    fg = M.base_30.nord_blue,
+  treesitter = {
+    ["@operator"] = { fg = M.base_30.nord_blue },
   },
 }
 
diff --git a/lua/base46/themes/gruvbox_light.lua b/lua/base46/themes/gruvbox_light.lua
index a8a6762..f503b4b 100644
--- a/lua/base46/themes/gruvbox_light.lua
+++ b/lua/base46/themes/gruvbox_light.lua
@@ -58,7 +58,9 @@ M.base_16 = {
 M.type = "light"
 
 M.polish_hl = {
-  TbLineThemeToggleBtn = { fg = M.base_30.black, bg = M.base_30.white },
+  tbline = {
+    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/kanagawa.lua b/lua/base46/themes/kanagawa.lua
index 5a5f4bc..083a273 100644
--- a/lua/base46/themes/kanagawa.lua
+++ b/lua/base46/themes/kanagawa.lua
@@ -56,24 +56,17 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@include"] = { fg = M.base_30.purple },
-  ["@uri"] = { fg = M.base_30.blue },
-  ["@tag.delimiter"] = { fg = M.base_30.red },
-
-  ["@field.key"] = {
-    fg = M.base_30.white,
-  },
-
-  ["@punctuation.bracket"] = {
-    fg = M.base_30.pmenu_bg,
-  },
-
-  ["@punctuation.delimiter"] = {
-    fg = M.base_30.white,
+  treesitter = {
+    ["@include"] = { fg = M.base_30.purple },
+    ["@uri"] = { fg = M.base_30.blue },
+    ["@tag.delimiter"] = { fg = M.base_30.red },
+    ["@field.key"] = { fg = M.base_30.white },
+    ["@punctuation.bracket"] = { fg = M.base_30.pmenu_bg },
+    ["@punctuation.delimiter"] = { fg = M.base_30.white },
   },
 
-  Number = {
-    fg = M.base_30.baby_pink,
+  syntax = {
+    Number = { fg = M.base_30.baby_pink },
   },
 }
 
diff --git a/lua/base46/themes/melange.lua b/lua/base46/themes/melange.lua
index 138af80..44dedff 100644
--- a/lua/base46/themes/melange.lua
+++ b/lua/base46/themes/melange.lua
@@ -59,24 +59,19 @@ M.base_16 = {
 M.type = "dark"
 
 M.polish_hl = {
-  ["@field"] = { fg = M.base_30.white },
-  ["@field.key"] = { fg = M.base_30.white },
-
-  ["@function.macro"] = {
-    fg = M.base_30.vibrant_green,
-  },
-
-  Include = {
-    fg = M.base_30.vibrant_green,
+  treesitter = {
+    ["@field"] = { fg = M.base_30.white },
+    ["@field.key"] = { fg = M.base_30.white },
+    ["@function.macro"] = {
+      fg = M.base_30.vibrant_green,
+    },
   },
 
-  Operator = {
-    fg = M.base_30.firered,
+  syntax = {
+    Include = { fg = M.base_30.vibrant_green },
+    Operator = { fg = M.base_30.firered },
+    Boolean = { fg = M.base_30.purple },
   },
-
-  Boolean = {
-    fg = M.base_30.purple
-  }
 }
 
 M = require("base46").override_theme(M, "melange")
diff --git a/lua/base46/themes/monekai.lua b/lua/base46/themes/monekai.lua
index 30d2629..50cc4fa 100644
--- a/lua/base46/themes/monekai.lua
+++ b/lua/base46/themes/monekai.lua
@@ -56,13 +56,18 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["parameter"] = { fg = M.base_30.blue },
-  ["@field.key"] = { fg = M.base_30.white },
-  ["@string"] = { fg = M.base_30.sun },
-  ["@boolean"] = { fg = M.base_16.base09 },
-  ["@punctuation.bracket"] = { fg = M.base_30.sun },
-  Operator = { fg = M.base_30.red },
-  ["@operator"] = { fg = M.base_30.red },
+  treesitter = {
+    ["parameter"] = { fg = M.base_30.blue },
+    ["@field.key"] = { fg = M.base_30.white },
+    ["@string"] = { fg = M.base_30.sun },
+    ["@boolean"] = { fg = M.base_16.base09 },
+    ["@punctuation.bracket"] = { fg = M.base_30.sun },
+    ["@operator"] = { fg = M.base_30.red },
+  },
+
+  syntax = {
+    Operator = { fg = M.base_30.red },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/monochrome.lua b/lua/base46/themes/monochrome.lua
index 9a17b9e..8c22df5 100644
--- a/lua/base46/themes/monochrome.lua
+++ b/lua/base46/themes/monochrome.lua
@@ -56,7 +56,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@punctuation.bracket"] = { fg = M.base_30.red },
+  treesitter = {
+    ["@punctuation.bracket"] = { fg = M.base_30.red },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/mountain.lua b/lua/base46/themes/mountain.lua
index 5576677..eb4fdae 100644
--- a/lua/base46/themes/mountain.lua
+++ b/lua/base46/themes/mountain.lua
@@ -56,7 +56,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@variable"] = { fg = M.base_16.base05 },
+  treesitter = {
+    ["@variable"] = { fg = M.base_16.base05 },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/nightfox.lua b/lua/base46/themes/nightfox.lua
index bbd446f..6f4fdea 100644
--- a/lua/base46/themes/nightfox.lua
+++ b/lua/base46/themes/nightfox.lua
@@ -56,10 +56,12 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@field.key"] = { fg = M.base_16.base05 },
-  ["@operator"] = { fg = M.base_30.dark_purple },
-  ["@keyword"] = { fg = M.base_30.teal },
-  ["@parameter"] = { fg = M.base_30.teal },
+  treesitter = {
+    ["@field.key"] = { fg = M.base_16.base05 },
+    ["@operator"] = { fg = M.base_30.dark_purple },
+    ["@keyword"] = { fg = M.base_30.teal },
+    ["@parameter"] = { fg = M.base_30.teal },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/nightowl.lua b/lua/base46/themes/nightowl.lua
index 0add592..5ffb18e 100644
--- a/lua/base46/themes/nightowl.lua
+++ b/lua/base46/themes/nightowl.lua
@@ -56,10 +56,11 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@parameter"] = { fg = M.base_30.orange },
-  ["@keyword.return"] = { fg = M.base_30.cyan },
-  ["@conditional"] = { fg = M.base_30.cyan },
-  PmenuSel = { bg = M.base_30.blue },
+  treesitter = {
+    ["@parameter"] = { fg = M.base_30.orange },
+    ["@keyword.return"] = { fg = M.base_30.cyan },
+    ["@conditional"] = { fg = M.base_30.cyan },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/nord.lua b/lua/base46/themes/nord.lua
index 977e486..554c500 100644
--- a/lua/base46/themes/nord.lua
+++ b/lua/base46/themes/nord.lua
@@ -56,8 +56,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@punctuation.bracket"] = { fg = M.base_30.white },
-  ["@punctuation.delimiter"] = { fg = M.base_30.white },
+  treesitter = {
+    ["@punctuation.bracket"] = { fg = M.base_30.white },
+    ["@punctuation.delimiter"] = { fg = M.base_30.white },
+  },
 }
 M.type = "dark"
 
diff --git a/lua/base46/themes/oceanic-light.lua b/lua/base46/themes/oceanic-light.lua
index e061ce2..64cc375 100644
--- a/lua/base46/themes/oceanic-light.lua
+++ b/lua/base46/themes/oceanic-light.lua
@@ -60,12 +60,19 @@ M.type = "light"
 M = require("base46").override_theme(M, "oceanic-next-light")
 
 M.polish_hl = {
-  St_NTerminalMode = { fg = M.base_30.white },
-  St_VisualMode = { bg = M.base_30.teal },
-  St_VisualModeSep = { fg = M.base_30.teal },
+  statusline = {
+    St_NTerminalMode = { fg = M.base_30.white },
+    St_VisualMode = { bg = M.base_30.teal },
+    St_VisualModeSep = { fg = M.base_30.teal },
+  },
 
-  ["@field"] = { fg = M.base_16.base0C },
-  Constant = { fg = M.base_16.base09 },
+  treesitter = {
+    ["@field"] = { fg = M.base_16.base0C },
+  },
+
+  syntax = {
+    Constant = { fg = M.base_16.base09 },
+  },
 }
 
 return M
diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index ab0f93f..dcbf990 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -57,11 +57,12 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@parameter"] = {
-    fg = M.base_16.base0A,
+  treesitter = {
+    ["@parameter"] = { fg = M.base_16.base0A },
   },
-  Constant = {
-    fg = M.base_16.base09,
+
+  syntax = {
+    Constant = { fg = M.base_16.base09 },
   },
 }
 
diff --git a/lua/base46/themes/one_light.lua b/lua/base46/themes/one_light.lua
index a75028c..5846d0a 100644
--- a/lua/base46/themes/one_light.lua
+++ b/lua/base46/themes/one_light.lua
@@ -58,15 +58,30 @@ M.base_16 = {
 M.type = "light"
 
 M.polish_hl = {
-  TelescopePromptPrefix = { fg = M.base_30.white },
-  TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
-  ["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
-  FloatBorder = { fg = M.base_16.base05 },
-  DiffAdd = { fg = M.base_16.base05 },
-  TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 },
-  WhichKeyDesc = { fg = M.base_30.white },
-  Pmenu = { bg = M.base_30.black2 },
-  St_pos_text = { fg = M.base_30.white },
+  telescope = {
+    TelescopePromptPrefix = { fg = M.base_30.white },
+    TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
+  },
+
+  treesitter = {
+    ["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
+  },
+
+  defaults = {
+    FloatBorder = { fg = M.base_16.base05 },
+    Pmenu = { bg = M.base_30.black2 },
+  },
+
+  git = {
+    DiffAdd = { fg = M.base_16.base05 },
+  },
+
+  tbline = {
+    TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 },
+  },
+
+  whichkey = { WhichKeyDesc = { fg = M.base_30.white } },
+  statusline = { St_pos_text = { fg = M.base_30.white } },
 }
 
 M = require("base46").override_theme(M, "one_light")
diff --git a/lua/base46/themes/onenord_light.lua b/lua/base46/themes/onenord_light.lua
index 5f4a3bf..bd6c54e 100644
--- a/lua/base46/themes/onenord_light.lua
+++ b/lua/base46/themes/onenord_light.lua
@@ -53,14 +53,29 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  WhichKeyDesc = { fg = M.base_30.white },
-  WhichKey = { fg = M.base_30.white },
-  TelescopePromptPrefix = { fg = M.base_30.white },
-  TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
-  ["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
-  FloatBorder = { fg = M.base_16.base05 },
-  DiffAdd = { fg = M.base_16.base05 },
-  St_pos_text = { fg = M.base_30.white },
+  whichkey = {
+    WhichKeyDesc = { fg = M.base_30.white },
+    WhichKey = { fg = M.base_30.white },
+  },
+
+  telescope = {
+    TelescopePromptPrefix = { fg = M.base_30.white },
+    TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
+  },
+
+  treesitter = {
+    ["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
+  },
+
+  defaults = { FloatBorder = { fg = M.base_16.base05 } },
+
+  statusline = {
+    St_pos_text = { fg = M.base_30.white },
+  },
+
+  git = {
+    DiffAdd = { fg = M.base_16.base05 },
+  },
 }
 
 M = require("base46").override_theme(M, "onenord_light")
diff --git a/lua/base46/themes/oxocarbon.lua b/lua/base46/themes/oxocarbon.lua
index c4f445e..644f68f 100644
--- a/lua/base46/themes/oxocarbon.lua
+++ b/lua/base46/themes/oxocarbon.lua
@@ -57,12 +57,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  Conditional = {
-    fg = M.base_30.nord_blue,
-  },
-
-  Tag = {
-    fg = M.base_30.white,
+  syntax = {
+    Conditional = { fg = M.base_30.nord_blue },
+    Tag = { fg = M.base_30.white },
   },
 }
 
diff --git a/lua/base46/themes/palenight.lua b/lua/base46/themes/palenight.lua
index d1c7165..0cdeda3 100644
--- a/lua/base46/themes/palenight.lua
+++ b/lua/base46/themes/palenight.lua
@@ -56,8 +56,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@include"] = { fg = M.base_30.purple },
-  ["@field.key"] = { fg = M.base_30.orange },
+  treesitter = {
+    ["@include"] = { fg = M.base_30.purple },
+    ["@field.key"] = { fg = M.base_30.orange },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/penumbra_dark.lua b/lua/base46/themes/penumbra_dark.lua
index c0b19a3..f53adab 100644
--- a/lua/base46/themes/penumbra_dark.lua
+++ b/lua/base46/themes/penumbra_dark.lua
@@ -56,36 +56,18 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@field.key"] = {
-    fg = M.base_30.red,
+  treesitter = {
+    ["@field.key"] = { fg = M.base_30.red },
+    ["@punctuation.bracket"] = { fg = M.base_16.base08 },
+    ["@constructor"] = { fg = M.base_30.orange },
+    ["@parameter"] = { fg = M.base_30.orange },
+    ["@tag.delimiter"] = { fg = M.base_16.base08 },
+    ["@tag.attribute"] = { link = "@annotation" },
   },
 
-  Constant = {
-    fg = M.base_30.red,
-  },
-
-  ["@punctuation.bracket"] = {
-    fg = M.base_16.base08,
-  },
-
-  ["@constructor"] = {
-    fg = M.base_30.orange,
-  },
-
-  ["@parameter"] = {
-    fg = M.base_30.orange,
-  },
-
-  Operator = {
-    fg = M.base_30.cyan,
-  },
-
-  ["@tag.delimiter"] = {
-    fg = M.base_16.base08,
-  },
-
-  ["@tag.attribute"] = {
-    link = "@annotation",
+  syntax = {
+    Operator = { fg = M.base_30.cyan },
+    Constant = { fg = M.base_30.red },
   },
 }
 
diff --git a/lua/base46/themes/penumbra_light.lua b/lua/base46/themes/penumbra_light.lua
index ce3d215..8dc964a 100644
--- a/lua/base46/themes/penumbra_light.lua
+++ b/lua/base46/themes/penumbra_light.lua
@@ -57,28 +57,16 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@function.builtin"] = {
-    fg = M.base_30.teal,
+  treesitter = {
+    ["@function.builtin"] = { fg = M.base_30.teal },
+    ["@field.key"] = { fg = M.base_30.red },
+    ["@punctuation.bracket"] = { fg = M.base_30.coal },
+    ["@field"] = { fg = M.base_30.coal },
   },
 
-  ["@field.key"] = {
-    fg = M.base_30.red,
-  },
-
-  Constant = {
-    fg = M.base_30.red,
-  },
-
-  ["@punctuation.bracket"] = {
-    fg = M.base_30.coal,
-  },
-
-  ["@field"] = {
-    fg = M.base_30.coal,
-  },
-
-  Include = {
-    fg = M.base_30.dark_purple,
+  syntax = {
+    Constant = { fg = M.base_30.red },
+    Include = { fg = M.base_30.dark_purple },
   },
 }
 
diff --git a/lua/base46/themes/purify.lua b/lua/base46/themes/purify.lua
deleted file mode 100644
index 83884a5..0000000
--- a/lua/base46/themes/purify.lua
+++ /dev/null
@@ -1,62 +0,0 @@
--- Credits to https://github.com/kyoz/purify for existing 
--- this is a modified version of it
-
-local M = {}
-
-M.base_30 = {
-  white = "#FAFAFA",
-  darker_black = '#121b24',
-  black = "#151F29", -- nvim bg
-  black2 = "#1b2835",
-  one_bg = "#213141",
-  one_bg2 = "#293c4f",
-  one_bg3 = "#334c64",
-  grey = "#36506a",
-  grey_fg = "#3e5b79",
-  grey_fg2 = "#47698b",
-  light_grey = "#4c7094",
-  red = "#FF6059",
-  baby_pink = "#FF88D5",
-  pink = "#FF79C6",
-  line = "#2A3441",
-  green = "#5FFF87",
-  vibrant_green = "#6AD4D6",
-  blue = "#5FAFFF",
-  nord_blue = "#52a2f2",
-  yellow = "#FFFF87",
-  sun = "#FFFF8F",
-  purple = "#AF87FF",
-  dark_purple = "#A070FF",
-  teal = "#5CC6C8",
-  orange = "#FF875F",
-  cyan = "#69C3FF",
-  statusline_bg = "#202A37",
-  lightbg = "#313B48",
-  pmenu_bg = "#5FAFFF",
-  folder_bg = "#5FAFFF",
-}
-
-M.base_16 = {
-  base00 = "#151F29",
-  base01 = "#252F3C",
-  base02 = "#313B48",
-  base03 = "#3D4754",
-  base04 = "#565C64",
-  base05 = "#EBEBEB",
-  base06 = "#F5F5F5",
-  base07 = "#FAFAFA",
-  base08 = "#FF79C6",
-  base09 = "#FF875F",
-  base0A = "#FFFF87",
-  base0B = "#5FFF87",
-  base0C = "#69C3FF",
-  base0D = "#5FAFFF",
-  base0E = "#AF87FF",
-  base0F = "#FF6059",
-}
-
-M.type = "dark"
-
-M = require("base46").override_theme(M, "purify")
-
-return M
diff --git a/lua/base46/themes/radium.lua b/lua/base46/themes/radium.lua
index ca24352..0282da5 100644
--- a/lua/base46/themes/radium.lua
+++ b/lua/base46/themes/radium.lua
@@ -56,8 +56,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@punctuation.bracket"] = { fg = M.base_16.base07 },
-  ["@parenthesis"] = { link = "@punctuation.bracket" },
+  treesitter = {
+    ["@punctuation.bracket"] = { fg = M.base_16.base07 },
+    ["@parenthesis"] = { link = "@punctuation.bracket" },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/tokyonight.lua b/lua/base46/themes/tokyonight.lua
index 5ecc000..ce9afa0 100644
--- a/lua/base46/themes/tokyonight.lua
+++ b/lua/base46/themes/tokyonight.lua
@@ -56,12 +56,14 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@variable"] = { fg = M.base_16.base05 },
-  ["@punctuation.bracket"] = { fg = M.base_30.purple },
-  ["@method.call"] = { fg = M.base_30.red },
-  ["@function.call"] = { fg = M.base_30.blue },
-  ["@constant"] = { fg = M.base_30.orange },
-  ["@parameter"] = { fg = M.base_30.orange },
+  treesitter = {
+    ["@variable"] = { fg = M.base_16.base05 },
+    ["@punctuation.bracket"] = { fg = M.base_30.purple },
+    ["@method.call"] = { fg = M.base_30.red },
+    ["@function.call"] = { fg = M.base_30.blue },
+    ["@constant"] = { fg = M.base_30.orange },
+    ["@parameter"] = { fg = M.base_30.orange },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/tomorrow_night.lua b/lua/base46/themes/tomorrow_night.lua
index 7d993c7..f75f19d 100644
--- a/lua/base46/themes/tomorrow_night.lua
+++ b/lua/base46/themes/tomorrow_night.lua
@@ -58,7 +58,9 @@ M.base_16 = {
 M.type = "dark"
 
 M.polish_hl = {
-  ["@function.builtin"] = { fg = M.base_30.yellow },
+  treesitter = {
+    ["@function.builtin"] = { fg = M.base_30.yellow },
+  },
   -- ["@punctuation.bracket"] = { fg = M.base_30.yellow },
 }
 
diff --git a/lua/base46/themes/tundra.lua b/lua/base46/themes/tundra.lua
index a9999ca..76b4f49 100644
--- a/lua/base46/themes/tundra.lua
+++ b/lua/base46/themes/tundra.lua
@@ -58,44 +58,21 @@ M.base_16 = {
 M.type = "dark"
 
 M.polish_hl = {
-  Constant = {
-    fg = M.base_30.orange,
-  },
-
-  ["@constructor"] = {
-    fg = M.base_30.cyan,
-  },
-
-  ["@keyword"] = {
-    fg = M.base_30.red,
-  },
-
-  ["@method.call"] = {
-    fg = M.base_30.cyan,
-  },
-
-  ["@function.call"] = {
-    fg = M.base_30.cyan,
-  },
-
-  ["@function.builtin"] = {
-    fg = M.base_30.orange,
-  },
-
-  Conditional = {
-    fg = M.base_30.baby_pink,
-  },
-
-  Repeat = {
-    fg = M.base_30.baby_pink,
-  },
 
-  Type = {
-    fg = M.base_30.baby_pink,
+  treesitter = {
+    ["@constructor"] = { fg = M.base_30.cyan },
+    ["@keyword"] = { fg = M.base_30.red },
+    ["@method.call"] = { fg = M.base_30.cyan },
+    ["@function.call"] = { fg = M.base_30.cyan },
+    ["@function.builtin"] = { fg = M.base_30.orange },
   },
 
-  Operator = {
-    fg = M.base_30.baby_pink,
+  syntax = {
+    Constant = { fg = M.base_30.orange },
+    Conditional = { fg = M.base_30.baby_pink },
+    Repeat = { fg = M.base_30.baby_pink },
+    Type = { fg = M.base_30.baby_pink },
+    Operator = { fg = M.base_30.baby_pink },
   },
 }
 
diff --git a/lua/base46/themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua
index f9801f0..9c427fd 100644
--- a/lua/base46/themes/vscode_dark.lua
+++ b/lua/base46/themes/vscode_dark.lua
@@ -58,12 +58,14 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@parameter"] = { fg = M.base_30.blue },
-  ["@keyword"] = { fg = M.base_30.blue },
-  ["@variable"] = { fg = M.base_30.cyan },
-  ["@field.key"] = { fg = M.base_30.green1 },
-  ["@keyword.return"] = { fg = M.base_16.base0E },
-  ["@keyword.function"] = { fg = M.base_30.teal },
+  treesitter = {
+    ["@parameter"] = { fg = M.base_30.blue },
+    ["@keyword"] = { fg = M.base_30.blue },
+    ["@variable"] = { fg = M.base_30.cyan },
+    ["@field.key"] = { fg = M.base_30.green1 },
+    ["@keyword.return"] = { fg = M.base_16.base0E },
+    ["@keyword.function"] = { fg = M.base_30.teal },
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/wombat.lua b/lua/base46/themes/wombat.lua
index cbabdac..680c075 100644
--- a/lua/base46/themes/wombat.lua
+++ b/lua/base46/themes/wombat.lua
@@ -56,7 +56,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@punctuation.bracket"] = { fg = M.base_30.sun },
+  treesitter = {
+    ["@punctuation.bracket"] = { fg = M.base_30.sun },
+  },
 }
 
 M.type = "dark"