diff --git a/lua/base46/themes/ayu-dark.lua b/lua/base46/themes/ayu-dark.lua
index bb41785..e3d169c 100644
--- a/lua/base46/themes/ayu-dark.lua
+++ b/lua/base46/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/lua/base46/themes/catppuccin.lua b/lua/base46/themes/catppuccin.lua
index 5d50cf4..6309f2a 100644
--- a/lua/base46/themes/catppuccin.lua
+++ b/lua/base46/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/lua/base46/themes/catppuccin_latte.lua b/lua/base46/themes/catppuccin_latte.lua
index 0bdfec5..5196deb 100644
--- a/lua/base46/themes/catppuccin_latte.lua
+++ b/lua/base46/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/lua/base46/themes/chadracula.lua b/lua/base46/themes/chadracula.lua
index 4d53282..f929dd3 100644
--- a/lua/base46/themes/chadracula.lua
+++ b/lua/base46/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/lua/base46/themes/chocolate.lua b/lua/base46/themes/chocolate.lua
index 5c3a225..fdf327a 100644
--- a/lua/base46/themes/chocolate.lua
+++ b/lua/base46/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 = "TSPunctBracket" },
+  ["@parameter"] = { fg = M.base_30.green },
+  ["@function.builtin"] = { fg = M.base_30.yellow },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua
index 178f38d..4814d2a 100644
--- a/lua/base46/themes/dark_horizon.lua
+++ b/lua/base46/themes/dark_horizon.lua
@@ -54,15 +54,15 @@ M.base_16 = {
 
 M.polish_hl = {
   Include = { fg = M.base_16.base0E, bold = true },
-  TSVariable = { fg = M.base_16.base08 },
-  TSProperty = { fg = M.base_16.base0E },
-  Repeat = { fg = M.base_16.base0E },
-  TSTagDelimiter = { fg = M.base_16.base05 },
-  TSFunction = { fg = M.base_30.orange },
   luaTSField = { fg = M.base_16.base0E },
-  TSParameter = { fg = M.base_16.base0F },
-  TSConstructor = { fg = M.base_16.base0A },
-  TSTagAttribute = { fg = M.base_16.orange },
+  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"
diff --git a/lua/base46/themes/doomchad.lua b/lua/base46/themes/doomchad.lua
index 1709a6c..a52649a 100644
--- a/lua/base46/themes/doomchad.lua
+++ b/lua/base46/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/lua/base46/themes/everforest.lua b/lua/base46/themes/everforest.lua
index d2efd55..25e562c 100644
--- a/lua/base46/themes/everforest.lua
+++ b/lua/base46/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/lua/base46/themes/everforest_light.lua b/lua/base46/themes/everforest_light.lua
index 0a092ed..bf731f9 100644
--- a/lua/base46/themes/everforest_light.lua
+++ b/lua/base46/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/lua/base46/themes/falcon.lua b/lua/base46/themes/falcon.lua
index 86febcb..f1fc43d 100644
--- a/lua/base46/themes/falcon.lua
+++ b/lua/base46/themes/falcon.lua
@@ -62,8 +62,8 @@ M.polish_hl = {
   Type = { fg = M.base_30.white2 },
   Include = { fg = M.base_30.tan },
   Keyword = { fg = M.base_16.base0D },
-  TSKeyword = { fg = M.base_16.base0D },
   Operator = { fg = M.base_30.red },
+  ["@keyword"] = { fg = M.base_16.base0D },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/gatekeeper.lua b/lua/base46/themes/gatekeeper.lua
index afb4d40..e262966 100644
--- a/lua/base46/themes/gatekeeper.lua
+++ b/lua/base46/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/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 39599a1..8005e31 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -56,7 +56,7 @@ M.polish_hl = {
   Include = { fg = M.base_16.base0E },
   TSVariable = { fg = M.base_16.base08 },
   TSProperty = { fg = M.base_16.base0C },
-  Repeat = { fg = M.base_16.base0E  },
+  Repeat = { fg = M.base_16.base0E },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua
index d2aec2c..0079782 100644
--- a/lua/base46/themes/vscode_dark.lua
+++ b/lua/base46/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/lua/base46/themes/yoru.lua b/lua/base46/themes/yoru.lua
index c58d8ad..464fb6f 100644
--- a/lua/base46/themes/yoru.lua
+++ b/lua/base46/themes/yoru.lua
@@ -1,55 +1,55 @@
 local M = {}
 
 M.base_30 = {
-	white = "#edeff0",
-	darker_black = "#060809",
-	black = "#0c0e0f", --  nvim bg
-	lighter_black = "#121415",
-	one_bg = "#161819",
-	one_bg2 = "#1f2122",
-	one_bg3 = "#27292a",
-	grey = "#343637",
-	grey_fg = "#3e4041",
-	grey_fg2 = "#484a4b",
-	light_grey = "#505253",
-	red = "#DF5B61",
-	baby_pink = "#EE6A70",
-	pink = "#e8646a",
-	line = "#1b1d1e", -- for lines like vertsplit
-	green = "#78B892",
-	vibrant_green = "#81c19b",
-	nord_blue = "#5A84BC",
-	blue = "#6791C9",
-	yellow = "#ecd28b",
-	sun = "#f6dc95",
-	purple = "#c58cec",
-	dark_purple = "#BC83E3",
-	teal = "#70b8ca",
-	orange = "#E89982",
-	cyan = "#67AFC1",
-	statusline_bg = "#101213",
-	lightbg = "#1d1f20",
-	pmenu_bg = "#78B892",
-	folder_bg = "#6791C9",
+  white = "#edeff0",
+  darker_black = "#060809",
+  black = "#0c0e0f", --  nvim bg
+  lighter_black = "#121415",
+  one_bg = "#161819",
+  one_bg2 = "#1f2122",
+  one_bg3 = "#27292a",
+  grey = "#343637",
+  grey_fg = "#3e4041",
+  grey_fg2 = "#484a4b",
+  light_grey = "#505253",
+  red = "#DF5B61",
+  baby_pink = "#EE6A70",
+  pink = "#e8646a",
+  line = "#1b1d1e", -- for lines like vertsplit
+  green = "#78B892",
+  vibrant_green = "#81c19b",
+  nord_blue = "#5A84BC",
+  blue = "#6791C9",
+  yellow = "#ecd28b",
+  sun = "#f6dc95",
+  purple = "#c58cec",
+  dark_purple = "#BC83E3",
+  teal = "#70b8ca",
+  orange = "#E89982",
+  cyan = "#67AFC1",
+  statusline_bg = "#101213",
+  lightbg = "#1d1f20",
+  pmenu_bg = "#78B892",
+  folder_bg = "#6791C9",
 }
 
 M.base_16 = {
-	base00 = "#0c0e0f",
-	base01 = "#121415",
-	base02 = "#161819",
-	base03 = "#1f2122",
-	base04 = "#27292a",
-	base05 = "#edeff0",
-	base06 = "#e4e6e7",
-	base07 = "#f2f4f5",
-	base08 = "#f26e74",
-	base09 = "#ecd28b",
-	base0A = "#e79881",
-	base0B = "#82c29c",
-	base0C = "#6791C9",
-	base0D = "#709ad2",
-	base0E = "#c58cec",
-	base0F = "#e8646a",
+  base00 = "#0c0e0f",
+  base01 = "#121415",
+  base02 = "#161819",
+  base03 = "#1f2122",
+  base04 = "#27292a",
+  base05 = "#edeff0",
+  base06 = "#e4e6e7",
+  base07 = "#f2f4f5",
+  base08 = "#f26e74",
+  base09 = "#ecd28b",
+  base0A = "#e79881",
+  base0B = "#82c29c",
+  base0C = "#6791C9",
+  base0D = "#709ad2",
+  base0E = "#c58cec",
+  base0F = "#e8646a",
 }
 
 vim.opt.bg = "dark"