new colorschemes

27 files changed, 475 insertions, 59 deletions

diff --git a/src/themes/ayu_dark.lua b/src/themes/ayu-dark.lua
index bb41785..e3d169c 100644
--- a/src/themes/ayu_dark.lua
+++ b/src/themes/ayu-dark.lua
@@ -53,12 +53,12 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSTagDelimiter = { fg = M.base_30.cyan },
-  TSFunction = { fg = M.base_30.orange },
   luaTSField = { fg = M.base_16.base0D },
-  TSParameter = { fg = M.base_16.base0F },
-  TSConstructor = { fg = M.base_16.base0A },
-  TSTagAttribute = { fg = M.base_30.orange },
+  ["@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/src/themes/ayu-light.lua b/src/themes/ayu-light.lua
new file mode 100644
index 0000000..e6068c5
--- /dev/null
+++ b/src/themes/ayu-light.lua
@@ -0,0 +1,71 @@
+-- credit to original theme for existing https://github.com/ayu-theme/ayu-vim
+-- NOTE : This is a modified version of it
+
+local M = {}
+
+M.base_30 = {
+  white = "#26292f",
+  darker_black = "#ededed",
+  black = "#fafafa", --  nvim bg
+  black2 = "#e3e3e3",
+  one_bg = "#ebebeb",
+  one_bg2 = "#e1e1e1", -- Highlight of context
+  one_bg3 = "#d7d7d7",
+  grey = "#cdcdcd",
+  grey_fg = "#b9b9b9",
+  grey_fg2 = "#acacac", -- Highlight background
+  light_grey = "#a0a0a0", -- Line numbers
+  red = "#E65050",
+  baby_pink = "#ff8282",
+  pink = "#ffa5a5",
+  line = "#e1e1e1", -- for lines like vertsplit
+  green = "#6CBF43",
+  vibrant_green = "#94e76b",
+  blue = "#399EE6",
+  nord_blue = "#2c91d9",
+  yellow = "#E6BA7E",
+  sun = "#f3c78b",
+  purple = "#9F40FF",
+  dark_purple = "#8627e6",
+  teal = "#74c5aa",
+  orange = "#FA8D3E",
+  cyan = "#95E6CB",
+  statusline_bg = "#f0f0f0",
+  lightbg = "#e6e6e6",
+  pmenu_bg = "#95E6CB",
+  folder_bg = "#5C6166",
+}
+
+M.base_16 = {
+  base00 = "#fafafa",
+  base01 = "#f0f0f0",
+  base02 = "#e6e6e6",
+  base03 = "#dcdcdc",
+  base04 = "#d2d2d2",
+  base05 = "#5C6166",
+  base06 = "#52575c",
+  base07 = "#484d52",
+  base08 = "#F07171",
+  base09 = "#A37ACC",
+  base0A = "#399EE6",
+  base0B = "#86B300",
+  base0C = "#4CBF99",
+  base0D = "#55B4D4",
+  base0E = "#FA8D3E",
+  base0F = "#F2AE49",
+}
+
+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 },
+}
+
+M = require("base46").override_theme(M, "ayu-light")
+
+vim.opt.bg = "light"
+
+return M
diff --git a/src/themes/catppuccin.lua b/src/themes/catppuccin.lua
index 5d50cf4..6309f2a 100644
--- a/src/themes/catppuccin.lua
+++ b/src/themes/catppuccin.lua
@@ -54,9 +54,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSVariable = { fg = M.base_30.lavender },
-  TSProperty = { fg = M.base_30.teal },
-  TSVariableBuiltin = { fg = M.base_30.red },
+  ["@variable"] = { fg = M.base_30.lavender },
+  ["@property"] = { fg = M.base_30.teal },
+  ["@variable.builtin"] = { fg = M.base_30.red },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/catppuccin_latte.lua b/src/themes/catppuccin_latte.lua
index 0bdfec5..5196deb 100644
--- a/src/themes/catppuccin_latte.lua
+++ b/src/themes/catppuccin_latte.lua
@@ -63,8 +63,8 @@ M.polish_hl = {
   WhichKeyDesc = { fg = M.base_30.white },
   Pmenu = { bg = M.base_30.black2 },
   St_pos_text = { fg = M.base_30.white },
-  TSVariableBuiltin = { fg = M.base_30.red },
-  TSProperty = { fg = M.base_30.teal },
+  ["@variable.builtin"] = { fg = M.base_30.red },
+  ["@property"] = { fg = M.base_30.teal },
 }
 
 M = require("base46").override_theme(M, "catppuccin_latte")
diff --git a/src/themes/chadracula.lua b/src/themes/chadracula.lua
index 4d53282..f929dd3 100644
--- a/src/themes/chadracula.lua
+++ b/src/themes/chadracula.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSFuncBuiltin = { fg = M.base_30.cyan },
-  TSNumber = { fg = M.base_30.purple },
+  ["@function.builtin"] = { fg = M.base_30.cyan },
+  ["@number"] = { fg = M.base_30.purple },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/chocolate.lua b/src/themes/chocolate.lua
index 5c3a225..1d4cacc 100644
--- a/src/themes/chocolate.lua
+++ b/src/themes/chocolate.lua
@@ -57,15 +57,15 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSField = { fg = M.base_30.purple },
-  TSVariable = { fg = M.base_16.base06 },
-  TSModule = { fg = M.base_30.beige },
+  ["@field"] = { fg = M.base_30.purple },
+  ["@variable"] = { fg = M.base_16.base06 },
+  ["@module"] = { fg = M.base_30.beige },
   Operator = { fg = M.base_30.blue },
-  TSAttribute = { fg = M.base_30.cyan },
-  TSPunctBracket = { fg = M.base_16.base06 },
-  TSParenthesis = { link = "TSPunctBracket" },
-  TSParameter = { fg = M.base_30.green },
-  TSFuncBuiltin = { fg = M.base_30.yellow },
+  ["@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 },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/dark_horizon.lua b/src/themes/dark_horizon.lua
new file mode 100644
index 0000000..4814d2a
--- /dev/null
+++ b/src/themes/dark_horizon.lua
@@ -0,0 +1,72 @@
+local M = {}
+
+M.base_30 = {
+  white = "#FFFFFF",
+  darker_black = "#080808",
+  black = "#0e0e0e", --  nvim bg
+  black2 = "#181818",
+  one_bg = "#1c1c1c",
+  one_bg2 = "#212121",
+  one_bg3 = "#292929",
+  grey = "#363636",
+  grey_fg = "#404040",
+  grey_fg2 = "#4a4a4a",
+  light_grey = "#525252",
+  red = "#dc322f",
+  baby_pink = "#a72e5b",
+  pink = "#ff75a0",
+  line = "#1d1d1d", -- for lines like vertsplit
+  green = "#AAD84C",
+  vibrant_green = "#b9e75b",
+  nord_blue = "#18a3af",
+  blue = "#25B0BC",
+  yellow = "#fdb830",
+  sun = "#ffc038",
+  purple = "#da70d6",
+  dark_purple = "#c65cc2",
+  teal = "#749689",
+  orange = "#FFA500",
+  cyan = "#6BE4E6",
+  statusline_bg = "#181818",
+  lightbg = "#292929",
+  pmenu_bg = "#15bf84",
+  folder_bg = "#07929e",
+}
+
+M.base_16 = {
+  base00 = "#0e0e0e",
+  base01 = "#181818",
+  base02 = "#292929",
+  base03 = "#363636",
+  base04 = "#3f4248",
+  base05 = "#c9c7be",
+  base06 = "#E6E1CF",
+  base07 = "#D9D7CE",
+  base08 = "#D9D7CE", -- Confirmed: Variables Confirmed
+  base09 = "#eaa273", -- Confirmed: Integers, Booleans
+  base0A = "#825aff", -- Classes
+  base0B = "#E3A587", -- Confirmed: Strings
+  base0C = "#F09483", -- Escape characters, Regular expressions
+  base0D = "#FFA500", -- Functions, Methods
+  base0E = "#2ca9b4", -- Confirmed: Keywords, Storage, Selector, Markup
+  base0F = "#d75271", -- Deprecated, Opening/Closing embedded language tags
+}
+
+M.polish_hl = {
+  Include = { fg = M.base_16.base0E, bold = true },
+  luaTSField = { fg = M.base_16.base0E },
+  Repeat = { fg = M.base_16.base0E },
+  ["@variable"] = { fg = M.base_16.base08 },
+  ["@property"] = { fg = M.base_16.base0E },
+  ["@tag.delimiter"] = { fg = M.base_16.base05 },
+  ["@function"] = { fg = M.base_30.orange },
+  ["@parameter"] = { fg = M.base_16.base0F },
+  ["@constructor"] = { fg = M.base_16.base0A },
+  ["@tag.attribute"] = { fg = M.base_16.orange },
+}
+
+vim.opt.bg = "dark"
+
+M = require("base46").override_theme(M, "dark_horizon")
+
+return M
diff --git a/src/themes/doomchad.lua b/src/themes/doomchad.lua
index 1709a6c..a52649a 100644
--- a/src/themes/doomchad.lua
+++ b/src/themes/doomchad.lua
@@ -53,7 +53,7 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSFieldKey = { fg = M.base_30.blue },
+  ["@field"] = { fg = M.base_30.blue },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/everforest.lua b/src/themes/everforest.lua
index d2efd55..25e562c 100644
--- a/src/themes/everforest.lua
+++ b/src/themes/everforest.lua
@@ -55,8 +55,8 @@ M.base_16 = {
 vim.opt.bg = "dark"
 
 M.polish_hl = {
-  TSTag = { fg = M.base_30.orange },
-  TSTagDelimiter = { fg = M.base_30.green },
+  ["@tag"] = { fg = M.base_30.orange },
+  ["@tag.delimiter"] = { fg = M.base_30.green },
 }
 
 M = require("base46").override_theme(M, "everforest")
diff --git a/src/themes/everforest_light.lua b/src/themes/everforest_light.lua
index 0a092ed..bf731f9 100644
--- a/src/themes/everforest_light.lua
+++ b/src/themes/everforest_light.lua
@@ -54,10 +54,6 @@ M.base_16 = {
 
 M.polish_hl = {
   DiffAdd = { fg = M.base_30.green },
-  TSTag = { fg = M.base_30.orange },
-  TSField = { fg = M.base_16.base05 },
-  TSInclude = { fg = M.base_16.base08 },
-  TSConstructor = { fg = M.base_30.blue },
   WhichKeyDesc = { fg = M.base_30.white },
   WhichKey = { fg = M.base_30.white },
   NvimTreeFolderName = { fg = "#4e565c" },
@@ -65,6 +61,10 @@ M.polish_hl = {
   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 },
 }
 
 vim.opt.bg = "light"
diff --git a/src/themes/falcon.lua b/src/themes/falcon.lua
new file mode 100644
index 0000000..f1fc43d
--- /dev/null
+++ b/src/themes/falcon.lua
@@ -0,0 +1,73 @@
+-- Credits to https://github.com/fenetikm/falcon as its the orignal theme
+-- This is a modified version of original theme
+
+local M = {}
+
+M.base_30 = {
+  white = "#F8F8FF",
+  white2 = "#DFDFE5",
+  tan = "#CFC1B2",
+  darker_black = "#000015",
+  black = "#020222", --  nvim bg
+  black2 = "#0b0b2b",
+  one_bg = "#161636",
+  one_bg2 = "#202040",
+  one_bg3 = "#2a2a4a",
+  grey = "#393959",
+  grey_fg = "#434363",
+  grey_fg2 = "#4d4d6d",
+  light_grey = "#5c5c7c",
+  red = "#FF761A",
+  baby_pink = "#FF8E78",
+  pink = "#ffafb7",
+  line = "#202040", -- for lines like vertsplit
+  green = "#9BCCBF",
+  vibrant_green = "#b9e75b",
+  nord_blue = "#a1bce1",
+  blue = "#6699cc",
+  yellow = "#FFC552",
+  sun = "#FFD392",
+  purple = "#99A4BC",
+  dark_purple = "#635196",
+  teal = "#34BFA4",
+  orange = "#f99157",
+  cyan = "#BFDAFF",
+  statusline_bg = "#0b0b2b",
+  lightbg = "#2a2a4a",
+  pmenu_bg = "#FFB07B",
+  folder_bg = "#598cbf",
+}
+
+M.base_16 = {
+  base00 = "#020222",
+  base01 = "#0b0b2b",
+  base02 = "#161636",
+  base03 = "#202040",
+  base04 = "#e4e4eb",
+  base05 = "#eeeef5",
+  base06 = "#f3f3fa",
+  base07 = "#F8F8FF",
+  base08 = "#BFDAFF",
+  base09 = "#B4B4B9",
+  base0A = "#FFC552",
+  base0B = "#C8D0E3",
+  base0C = "#B4B4B9",
+  base0D = "#FFC552",
+  base0E = "#8BCCBF",
+  base0F = "#DFDFE5",
+}
+
+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 },
+}
+
+vim.opt.bg = "dark"
+
+M = require("base46").override_theme(M, "falcon")
+
+return M
diff --git a/src/themes/gatekeeper.lua b/src/themes/gatekeeper.lua
index afb4d40..e262966 100644
--- a/src/themes/gatekeeper.lua
+++ b/src/themes/gatekeeper.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSVariable = { fg = M.base_30.orange },
-  TSParameter = { fg = M.base_30.white },
+  ["@variable"] = { fg = M.base_30.orange },
+  ["@parameter"] = { fg = M.base_30.white },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/gruvbox_material.lua b/src/themes/gruvbox_material.lua
new file mode 100644
index 0000000..9340972
--- /dev/null
+++ b/src/themes/gruvbox_material.lua
@@ -0,0 +1,66 @@
+local M = {}
+
+M.base_30 = {
+  white = "#ebdbb2",
+  darker_black = "#222222",
+  black = "#282828", --  nvim bg
+  black2 = "#2e2e2e",
+  one_bg = "#323232",
+  one_bg2 = "#3b3b3b",
+  one_bg3 = "#434343",
+  grey = "#505050",
+  grey_fg = "#5a5a5a",
+  grey_fg2 = "#646464",
+  light_grey = "#6c6c6c",
+  red = "#ea6962",
+  baby_pink = "#ce8196",
+  pink = "#ff75a0",
+  line = "#373737", -- for lines like vertsplit
+  green = "#89b482",
+  vibrant_green = "#a9b665",
+  nord_blue = "#6f8faf",
+  blue = "#6d8dad",
+  yellow = "#d8a657",
+  sun = "#eab869",
+  purple = "#d3869b",
+  dark_purple = "#d3869b",
+  teal = "#749689",
+  orange = "#e78a4e",
+  cyan = "#89b482",
+  statusline_bg = "#2c2c2c",
+  lightbg = "#393939",
+  pmenu_bg = "#89b482",
+  folder_bg = "#6d8dad",
+}
+
+M.base_16 = {
+  base0A = "#d8a657",
+  base04 = "#d4be98",
+  base07 = "#c7b89d",
+  base05 = "#c0b196",
+  base0E = "#ea6962",
+  base0D = "#a9b665",
+  base0C = "#89b482",
+  base0B = "#89b482",
+  base02 = "#323232",
+  base0F = "#dd8044",
+  base03 = "#434343",
+  base08 = "#7daea3",
+  base01 = "#2e2e2e",
+  base00 = "#282828",
+  base09 = "#e78a4e",
+  base06 = "#d4be98",
+}
+
+M.polish_hl = {
+  Include = { fg = M.base_16.base0E },
+  Repeat = { fg = M.base_16.base0E },
+  ["@variable"] = { fg = M.base_16.base08 },
+  ["@property"] = { fg = M.base_16.base0C },
+}
+
+vim.opt.bg = "dark"
+
+M = require("base46").override_theme(M, "gruvbox_material")
+
+return M
diff --git a/src/themes/kanagawa.lua b/src/themes/kanagawa.lua
index 0cd3be1..df8a4bd 100644
--- a/src/themes/kanagawa.lua
+++ b/src/themes/kanagawa.lua
@@ -53,9 +53,12 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSInclude = { fg = M.base_30.purple },
-  TSURI = { fg = M.base_30.blue },
-  TSTagDelimiter = { fg = M.base_30.red },
+  ["@include"] = { fg = M.base_30.purple },
+  ["@uri"] = { fg = M.base_30.blue },
+  ["@tag.delimiter"] = { fg = M.base_30.red },
+  Number = {
+    fg = M.base_30.baby_pink,
+  },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/monekai.lua b/src/themes/monekai.lua
index 25bf15c..6d444f7 100644
--- a/src/themes/monekai.lua
+++ b/src/themes/monekai.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSParameter = { fg = M.base_30.blue },
-  TSFieldKey = { fg = M.base_30.red },
+  ["@parameter"] = { fg = M.base_30.blue },
+  ["@field.key"] = { fg = M.base_30.red },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/mountain.lua b/src/themes/mountain.lua
index b5d6ec6..8ce5729 100644
--- a/src/themes/mountain.lua
+++ b/src/themes/mountain.lua
@@ -53,7 +53,7 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSVariable = { fg = M.base_16.base05 },
+  ["@variable"] = { fg = M.base_16.base05 },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/nightowl.lua b/src/themes/nightowl.lua
index 827ad8e..2af749f 100644
--- a/src/themes/nightowl.lua
+++ b/src/themes/nightowl.lua
@@ -53,9 +53,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSParameter = { fg = M.base_30.orange },
-  TSKeywordReturn = { fg = M.base_30.cyan },
-  TSConditional = { fg = M.base_30.cyan },
+  ["@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 },
 }
 
diff --git a/src/themes/nord.lua b/src/themes/nord.lua
index 2693d38..7332381 100644
--- a/src/themes/nord.lua
+++ b/src/themes/nord.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSPunctBracket = { fg = M.base_30.white },
-  TSPunctDelimiter = { fg = M.base_30.white },
+  ["@punctuation.bracket"] = { fg = M.base_30.white },
+  ["@punctuation.delimiter"] = { fg = M.base_30.white },
 }
 vim.opt.bg = "dark"
 
diff --git a/src/themes/oceanic-next.lua b/src/themes/oceanic-next.lua
new file mode 100644
index 0000000..864926d
--- /dev/null
+++ b/src/themes/oceanic-next.lua
@@ -0,0 +1,72 @@
+-- credits to original theme https://github.com/voronianski/oceanic-next-color-scheme
+-- This is a modified version of the original theme.
+
+local M = {}
+
+M.base_30 = {
+  white = "#D8DEE9", -- confirmed
+  darker_black = "#15252e",
+  black = "#1B2B34", --  nvim bg
+  black2 = "#21313a",
+  one_bg = "#25353e",
+  one_bg2 = "#2e3e47",
+  one_bg3 = "#36464f",
+  grey = "#43535c",
+  grey_fg = "#4d5d66",
+  grey_fg2 = "#576770",
+  light_grey = "#5f6f78",
+  red = "#EC5F67",
+  baby_pink = "#ff7d85",
+  pink = "#ffafb7",
+  line = "#2a3a43", -- for lines like vertsplit
+  green = "#99C794",
+  vibrant_green = "#b9e75b",
+  nord_blue = "#598cbf",
+  blue = "#6699CC",
+  yellow = "#FAC863",
+  sun = "#ffd06b",
+  purple = "#C594C5",
+  dark_purple = "#ac7bac",
+  teal = "#50a4a4",
+  orange = "#F99157",
+  cyan = "#62B3B2",
+  statusline_bg = "#1f2f38",
+  lightbg = "#2c3c45",
+  pmenu_bg = "#15bf84",
+  folder_bg = "#598cbf",
+}
+
+-- Base16 colors taken from:
+M.base_16 = {
+  base00 = "#1B2B34", -- Confirmed
+  base01 = "#343D46", -- Confirmed
+  base02 = "#4F5B66", -- Confirmed
+  base03 = "#65737e", -- Confirmed
+  base04 = "#A7ADBa", -- Confirmed
+  base05 = "#C0C5Ce", -- Confirmed
+  base06 = "#CDD3De", -- Confirmed
+  base07 = "#D8DEE9", -- Confirmed
+  base08 = "#6cbdbc", -- Confirmed
+  base09 = "#FAC863", -- Confirmed
+  base0A = "#F99157", -- Confirmed
+  base0B = "#99C794", -- Confirmed
+  base0C = "#5aaeae", -- Confirmed
+  base0D = "#6699CC", -- Confirmed
+  base0E = "#C594C5", -- Confirmed
+  base0F = "#EC5F67", -- Confirmed
+}
+
+M.polish_hl = {
+  ["@parameter"] = {
+    fg = M.base_16.base0A,
+  },
+  Constant = {
+    fg = M.base_16.base09,
+  },
+}
+
+vim.opt.bg = "dark"
+
+M = require("base46").override_theme(M, "oceanic-next")
+
+return M
diff --git a/src/themes/one_light.lua b/src/themes/one_light.lua
index 9590651..99bf3fd 100644
--- a/src/themes/one_light.lua
+++ b/src/themes/one_light.lua
@@ -57,7 +57,7 @@ vim.opt.bg = "light"
 M.polish_hl = {
   TelescopePromptPrefix = { fg = M.base_30.white },
   TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
-  TSPunctBracket = { fg = M.base_30.nord_blue },
+  ["@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 },
diff --git a/src/themes/onenord_light.lua b/src/themes/onenord_light.lua
index 6010435..ef98fa7 100644
--- a/src/themes/onenord_light.lua
+++ b/src/themes/onenord_light.lua
@@ -57,7 +57,7 @@ M.polish_hl = {
   WhichKey = { fg = M.base_30.white },
   TelescopePromptPrefix = { fg = M.base_30.white },
   TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
-  TSPunctBracket = { fg = M.base_30.nord_blue },
+  ["@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 },
diff --git a/src/themes/palenight.lua b/src/themes/palenight.lua
index d332466..273e003 100644
--- a/src/themes/palenight.lua
+++ b/src/themes/palenight.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSInclude = { fg = M.base_30.purple },
-  TSFieldKey = { fg = M.base_30.orange },
+  ["@include"] = { fg = M.base_30.purple },
+  ["@field.key"] = { fg = M.base_30.orange },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/radium.lua b/src/themes/radium.lua
index 5c18dec..294e580 100644
--- a/src/themes/radium.lua
+++ b/src/themes/radium.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSPunctBracket = { fg = M.base_16.base07 },
-  TSParenthesis = { link = "TSPunctBracket" },
+  ["@punctuation.bracket"] = { fg = M.base_16.base07 },
+  ["@parenthesis"] = { link = "@punctuation.bracket" },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/solarized_dark.lua b/src/themes/solarized_dark.lua
new file mode 100644
index 0000000..022a1b7
--- /dev/null
+++ b/src/themes/solarized_dark.lua
@@ -0,0 +1,59 @@
+local M = {}
+
+M.base_30 = {
+  white = "#abb2bf",
+  darker_black = "#002530",
+  black = "#002b36", --  nvim bg
+  black2 = "#06313c",
+  one_bg = "#0a3540", -- real bg of onedark
+  one_bg2 = "#133e49",
+  one_bg3 = "#1b4651",
+  grey = "#28535e",
+  grey_fg = "#325d68",
+  grey_fg2 = "#3c6772",
+  light_grey = "#446f7a",
+  red = "#dc322f",
+  baby_pink = "#eb413e",
+  pink = "#d33682",
+  line = "#0f3a45", -- for lines like vertsplit
+  green = "#859900",
+  vibrant_green = "#b2c62d",
+  nord_blue = "#197ec5",
+  blue = "#268bd2",
+  yellow = "#b58900",
+  sun = "#c4980f",
+  purple = "#6c71c4",
+  dark_purple = "#5d62b5",
+  teal = "#519ABA",
+  orange = "#cb4b16",
+  cyan = "#2aa198",
+  statusline_bg = "#042f3a",
+  lightbg = "#113c47",
+  pmenu_bg = "#268bd2",
+  folder_bg = "#268bd2",
+}
+
+M.base_16 = {
+  base00 = "#002b36",
+  base01 = "#073642",
+  base02 = "#586e75",
+  base03 = "#657b83",
+  base04 = "#839496",
+  base05 = "#93a1a1",
+  base06 = "#eee8d5",
+  base07 = "#fdf6e3",
+  base08 = "#dc322f",
+  base09 = "#cb4b16",
+  base0A = "#b58900",
+  base0B = "#859900",
+  base0C = "#2aa198",
+  base0D = "#268bd2",
+  base0E = "#6c71c4",
+  base0F = "#d33682",
+}
+
+vim.opt.bg = "dark"
+
+M = require("base46").override_theme(M, "solarized_dark")
+
+return M
diff --git a/src/themes/tokyonight.lua b/src/themes/tokyonight.lua
index a52165a..0ad4265 100644
--- a/src/themes/tokyonight.lua
+++ b/src/themes/tokyonight.lua
@@ -53,9 +53,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSVariable = { fg = M.base_30.red },
-  TSFuncBuiltin = { fg = M.base_30.cyan },
-  TSParameter = { fg = M.base_30.white },
+  ["@variable"] = { fg = M.base_30.red },
+  ["@function.builtin"] = { fg = M.base_30.cyan },
+  ["@parameter"] = { fg = M.base_30.white },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/vscode_dark.lua b/src/themes/vscode_dark.lua
index d2aec2c..0079782 100644
--- a/src/themes/vscode_dark.lua
+++ b/src/themes/vscode_dark.lua
@@ -55,13 +55,13 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSParameter = { fg = M.base_30.blue },
-  TSKeyword = { fg = M.base_30.blue },
-  TSVariable = { fg = M.base_30.cyan },
   luaTSField = { fg = M.base_30.teal },
-  TSFieldKey = { fg = M.base_30.green1 },
-  TSKeywordReturn = { fg = M.base_16.base0E },
-  TSKeywordFunction = { fg = M.base_30.teal },
+  ["@parameter"] = { fg = M.base_30.blue },
+  ["@keyword"] = { fg = M.base_30.blue },
+  ["@variable"] = { fg = M.base_30.cyan },
+  ["@fieldkey"] = { fg = M.base_30.green1 },
+  ["@keywordreturn"] = { fg = M.base_16.base0E },
+  ["@keywordfunction"] = { fg = M.base_30.teal },
 }
 
 vim.opt.bg = "dark"
diff --git a/src/themes/wombat.lua b/src/themes/wombat.lua
index a59addf..462a6e3 100644
--- a/src/themes/wombat.lua
+++ b/src/themes/wombat.lua
@@ -53,10 +53,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSInclude = { fg = M.base_30.red },
-  TSConstructor = { fg = M.base_30.orange },
-  TSVariable = { link = "TSConstructor" },
-  TSConditional = { link = "TSInclude" },
+  ["@include"] = { fg = M.base_30.red },
+  ["@constructor"] = { fg = M.base_30.orange },
+  ["@variable"] = { link = "@constructor" },
+  ["@conditional"] = { link = "@include" },
 }
 
 vim.opt.bg = "dark"