diff --git a/lua/base46/integrations/semantic_tokens.lua b/lua/base46/integrations/semantic_tokens.lua
index 56cb808..f83914a 100644
--- a/lua/base46/integrations/semantic_tokens.lua
+++ b/lua/base46/integrations/semantic_tokens.lua
@@ -8,9 +8,9 @@ return {
   ["@lsp.type.function"] = { link = "@function" },
   ["@lsp.type.interface"] = { link = "Structure" },
   ["@lsp.type.macro"] = { link = "@macro" },
-  ["@lsp.type.method"] = { link = "@method" },
-  ["@lsp.type.namespace"] = { link = "@namespace" },
-  ["@lsp.type.parameter"] = { link = "@parameter" },
+  ["@lsp.type.method"] = { link = "@function.method" },
+  ["@lsp.type.namespace"] = { link = "@module" },
+  ["@lsp.type.parameter"] = { link = "@variable.parameter" },
   ["@lsp.type.property"] = { link = "@property" },
   ["@lsp.type.struct"] = { link = "Structure" },
   ["@lsp.type.type"] = { link = "@type" },
diff --git a/lua/base46/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua
index a7a465a..064a022 100644
--- a/lua/base46/integrations/treesitter.lua
+++ b/lua/base46/integrations/treesitter.lua
@@ -1,5 +1,6 @@
 local theme = require("base46").get_theme_tb "base_16"
 local base30 = require("base46").get_theme_tb "base_30"
+local colors = require("base46").get_theme_tb "base_30"
 
 return {
   ["@annotation"] = { fg = theme.base0F },
@@ -10,8 +11,8 @@ return {
   ["@constant.builtin"] = { fg = theme.base09 },
   ["@constant.macro"] = { fg = theme.base08 },
   ["@error"] = { fg = theme.base08 },
-  ["@exception"] = { fg = theme.base08 },
-  ["@float"] = { fg = theme.base09 },
+  ["@keyword.exception"] = { fg = theme.base08 },
+  ["@number.float"] = { fg = theme.base09 },
   ["@keyword"] = { fg = theme.base0E },
   ["@keyword.function"] = { fg = theme.base0E },
   ["@keyword.return"] = { fg = theme.base0E },
@@ -21,39 +22,58 @@ return {
   ["@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 },
+  ["@function.method"] = { fg = theme.base0D },
+  ["@function.method.call"] = { fg = theme.base0D },
+  ["@module"] = { fg = theme.base08 },
+  ["@variable.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 },
+  ["@string.special.url"] = { 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 },
+  ["@variable.member"] = { fg = theme.base08 },
+  ["@variable.member.key"] = { fg = theme.base08 },
   ["@property"] = { fg = theme.base08 },
-  ["@include"] = { link = "Include" },
-  ["@conditional"] = { fg = theme.base0E },
-  ["@conditional.ternary"] = { fg = theme.base0E },
+  ["@keyword.import"] = { link = "Include" },
+  ["@keyword.conditional"] = { fg = theme.base0E },
+  ["@keyword.conditional.ternary"] = { fg = theme.base0E },
   ["@comment"] = { fg = base30.grey_fg },
+  ["@keyword.repeat"] = { fg = theme.base0A },
+  ["@keyword.storage"] = { fg = theme.base0A },
+  ["@keyword.directive.define"] = { fg = theme.base0E },
+  ["@keyword.directive"] = { fg = theme.base0A },
+
+  -- markup
+  ["@markup.heading"] = { fg = theme.base0D },
+  ["@markup.raw"] = { fg = theme.base09 },
+  ["@markup.link"] = { fg = theme.base08 },
+  ["@markup.link.url"] = { fg = theme.base09, underline = true },
+  ["@markup.link.label"] = { fg = theme.base0C },
+  ["@markup.list"] = { fg = theme.base08 },
+  ["@markup.strong"] = { bold = true },
+  ["@markup.italic"] = { italic = true },
+  ["@markup.strikethrough"] = { strikethrough = true },
+
+  ["@comment.todo"] = { fg = colors.grey, bg = colors.white },
+  ["@comment.warning"] = { fg = colors.black2, bg = theme.base09 },
+  ["@comment.note"] = { fg = colors.black2, bg = colors.white },
+  ["@comment.danger"] = { fg = colors.black2, bg = colors.red },
+
+  ["@diff.plus"] = { fg = colors.green },
+  ["@diff.minus"] = { fg = colors.red },
+  ["@diff.delta"] = { fg = colors.light_grey },
 }
diff --git a/lua/base46/themes/ayu_dark.lua b/lua/base46/themes/ayu_dark.lua
index 2a17632..1ea26c8 100644
--- a/lua/base46/themes/ayu_dark.lua
+++ b/lua/base46/themes/ayu_dark.lua
@@ -60,7 +60,7 @@ 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 },
+    ["@variable.parameter"] = { fg = M.base_16.base0F },
     ["@constructor"] = { fg = M.base_16.base0A },
     ["@tag.attribute"] = { fg = M.base_30.orange },
   },
diff --git a/lua/base46/themes/ayu_light.lua b/lua/base46/themes/ayu_light.lua
index 3e25c11..8e28572 100644
--- a/lua/base46/themes/ayu_light.lua
+++ b/lua/base46/themes/ayu_light.lua
@@ -60,7 +60,7 @@ 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 },
+    ["@variable.parameter"] = { fg = M.base_16.base09 },
     ["@constructor"] = { fg = M.base_16.base0C },
     ["@tag.attribute"] = { fg = M.base_30.base0F },
   },
diff --git a/lua/base46/themes/bearded-arc.lua b/lua/base46/themes/bearded-arc.lua
index 2ccb979..4f9e618 100644
--- a/lua/base46/themes/bearded-arc.lua
+++ b/lua/base46/themes/bearded-arc.lua
@@ -59,7 +59,7 @@ M.type = "dark"
 
 M.polish_hl = {
   treesitter = {
-    ["@parameter"] = { fg = M.base_30.pink },
+    ["@variable.parameter"] = { fg = M.base_30.pink },
     ["@attribute"] = { fg = M.base_30.purple },
   },
 }
diff --git a/lua/base46/themes/chadracula-evondev.lua b/lua/base46/themes/chadracula-evondev.lua
index 1768721..f2c2c9a 100644
--- a/lua/base46/themes/chadracula-evondev.lua
+++ b/lua/base46/themes/chadracula-evondev.lua
@@ -62,10 +62,10 @@ M.polish_hl = {
   treesitter = {
     ["@function.builtin"] = { fg = M.base_30.cyan },
     ["@number"] = { fg = M.base_30.purple },
-    ["@namespace"] = { fg = M.base_30.white },
+    ["@module"] = { fg = M.base_30.white },
     ["@function.call"] = { fg = M.base_30.vibrant_green },
     ["@function"] = { fg = M.base_30.green },
-    ["@repeat"] = { fg = M.base_30.green },
+    ["@keyword.repeat"] = { fg = M.base_30.green },
   },
 
   syntax = {
diff --git a/lua/base46/themes/chocolate.lua b/lua/base46/themes/chocolate.lua
index b3011bb..8179615 100644
--- a/lua/base46/themes/chocolate.lua
+++ b/lua/base46/themes/chocolate.lua
@@ -62,13 +62,13 @@ M.polish_hl = {
   },
 
   treesitter = {
-    ["@field"] = { fg = M.base_30.purple },
+    ["@variable.member"] = { 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 },
+    ["@variable.parameter"] = { fg = M.base_30.green },
     ["@function.builtin"] = { fg = M.base_30.yellow },
   },
 }
diff --git a/lua/base46/themes/doomchad.lua b/lua/base46/themes/doomchad.lua
index 5af56e5..3a85308 100644
--- a/lua/base46/themes/doomchad.lua
+++ b/lua/base46/themes/doomchad.lua
@@ -57,7 +57,7 @@ M.base_16 = {
 
 M.polish_hl = {
   treesitter = {
-    ["@field"] = { fg = M.base_30.blue },
+    ["@variable.member"] = { fg = M.base_30.blue },
     ["@punctuation.bracket"] = { fg = M.base_30.yellow },
   },
 }
diff --git a/lua/base46/themes/everforest_light.lua b/lua/base46/themes/everforest_light.lua
index 4073f93..04e3013 100644
--- a/lua/base46/themes/everforest_light.lua
+++ b/lua/base46/themes/everforest_light.lua
@@ -84,8 +84,8 @@ M.polish_hl = {
 
   treesitter = {
     ["@tag"] = { fg = M.base_30.orange },
-    ["@field"] = { fg = M.base_16.base05 },
-    ["@include"] = { fg = M.base_16.base08 },
+    ["@variable.member"] = { fg = M.base_16.base05 },
+    ["@keyword.import"] = { fg = M.base_16.base08 },
     ["@constructor"] = { fg = M.base_30.blue },
   },
 }
diff --git a/lua/base46/themes/flexoki-light.lua b/lua/base46/themes/flexoki-light.lua
index a255c9f..e8cd148 100644
--- a/lua/base46/themes/flexoki-light.lua
+++ b/lua/base46/themes/flexoki-light.lua
@@ -64,11 +64,12 @@ M.polish_hl = {
   },
   treesitter = {
     ["@keyword"] = { fg = M.base_30.cyan },
-    ["@parameter"] = { fg = M.base_30.baby_pink },
+    ["@variable.parameter"] = { fg = M.base_30.baby_pink },
     ["@tag.attribute"] = { fg = M.base_30.orange },
     ["@tag"] = { fg = M.base_30.blue },
     ["@string"] = { fg = M.base_30.green },
-    ["@text.uri"] = { fg = M.base_30.green },
+    ["@string.special.url"] = { fg = M.base_30.green },
+    ["@markup.link.url"] = { fg = M.base_30.green },
     ["@punctuation.bracket"] = { fg = M.base_30.yellow },
     ["@constant.lua"] = { fg = M.base_30.white },
   },
diff --git a/lua/base46/themes/flexoki.lua b/lua/base46/themes/flexoki.lua
index 044e95e..9a7878d 100644
--- a/lua/base46/themes/flexoki.lua
+++ b/lua/base46/themes/flexoki.lua
@@ -64,11 +64,12 @@ M.polish_hl = {
   },
   treesitter = {
     ["@keyword"] = { fg = M.base_30.cyan },
-    ["@parameter"] = { fg = M.base_30.baby_pink },
+    ["@variable.parameter"] = { fg = M.base_30.baby_pink },
     ["@tag.attribute"] = { fg = M.base_30.orange },
     ["@tag"] = { fg = M.base_30.blue },
     ["@string"] = { fg = M.base_30.green },
-    ["@text.uri"] = { fg = M.base_30.green },
+    ["@string.special.url"] = { fg = M.base_30.green },
+    ["@markup.link.url"] = { fg = M.base_30.green },
     ["@punctuation.bracket"] = { fg = M.base_30.yellow },
   },
 }
diff --git a/lua/base46/themes/gatekeeper.lua b/lua/base46/themes/gatekeeper.lua
index 15a2659..1fa0550 100644
--- a/lua/base46/themes/gatekeeper.lua
+++ b/lua/base46/themes/gatekeeper.lua
@@ -55,7 +55,7 @@ M.base_16 = {
 M.polish_hl = {
   treesitter = {
     ["@variable"] = { fg = M.base_30.orange },
-    ["@parameter"] = { fg = M.base_30.white },
+    ["@variable.parameter"] = { fg = M.base_30.white },
   },
 }
 
diff --git a/lua/base46/themes/github_dark.lua b/lua/base46/themes/github_dark.lua
index 56d7a53..2e69a83 100644
--- a/lua/base46/themes/github_dark.lua
+++ b/lua/base46/themes/github_dark.lua
@@ -61,9 +61,9 @@ M.polish_hl = {
   treesitter = {
     ["@punctuation.bracket"] = { fg = M.base_30.orange },
     ["@string"] = { fg = M.base_30.white },
-    ["@field.key"] = { fg = M.base_30.white },
+    ["@variable.member.key"] = { fg = M.base_30.white },
     ["@constructor"] = { fg = M.base_30.vibrant_green },
-    ["@tag.attribute"] = { link = "@method" },
+    ["@tag.attribute"] = { link = "@function.method" },
   },
 }
 
diff --git a/lua/base46/themes/github_light.lua b/lua/base46/themes/github_light.lua
index a5d6af6..57774aa 100644
--- a/lua/base46/themes/github_light.lua
+++ b/lua/base46/themes/github_light.lua
@@ -60,7 +60,7 @@ M.type = "light"
 M.polish_hl = {
   treesitter = {
     ["@punctuation.bracket"] = { fg = M.base_30.blue },
-    ["@field.key"] = { fg = M.base_30.white },
+    ["@variable.member.key"] = { fg = M.base_30.white },
     ["@constructor"] = { fg = M.base_30.vibrant_green },
     ["@operator"] = { fg = M.base_30.orange },
   },
diff --git a/lua/base46/themes/kanagawa.lua b/lua/base46/themes/kanagawa.lua
index 083a273..6de2120 100644
--- a/lua/base46/themes/kanagawa.lua
+++ b/lua/base46/themes/kanagawa.lua
@@ -57,10 +57,10 @@ M.base_16 = {
 
 M.polish_hl = {
   treesitter = {
-    ["@include"] = { fg = M.base_30.purple },
+    ["@keyword.import"] = { 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 },
+    ["@variable.member.key"] = { fg = M.base_30.white },
     ["@punctuation.bracket"] = { fg = M.base_30.pmenu_bg },
     ["@punctuation.delimiter"] = { fg = M.base_30.white },
   },
diff --git a/lua/base46/themes/melange.lua b/lua/base46/themes/melange.lua
index 44dedff..2479666 100644
--- a/lua/base46/themes/melange.lua
+++ b/lua/base46/themes/melange.lua
@@ -60,8 +60,8 @@ M.type = "dark"
 
 M.polish_hl = {
   treesitter = {
-    ["@field"] = { fg = M.base_30.white },
-    ["@field.key"] = { fg = M.base_30.white },
+    ["@variable.member"] = { fg = M.base_30.white },
+    ["@variable.member.key"] = { fg = M.base_30.white },
     ["@function.macro"] = {
       fg = M.base_30.vibrant_green,
     },
diff --git a/lua/base46/themes/monekai.lua b/lua/base46/themes/monekai.lua
index 50cc4fa..cfa6f6b 100644
--- a/lua/base46/themes/monekai.lua
+++ b/lua/base46/themes/monekai.lua
@@ -58,7 +58,7 @@ M.base_16 = {
 M.polish_hl = {
   treesitter = {
     ["parameter"] = { fg = M.base_30.blue },
-    ["@field.key"] = { fg = M.base_30.white },
+    ["@variable.member.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 },
diff --git a/lua/base46/themes/nano-light.lua b/lua/base46/themes/nano-light.lua
index dd22f3e..b950093 100644
--- a/lua/base46/themes/nano-light.lua
+++ b/lua/base46/themes/nano-light.lua
@@ -67,11 +67,11 @@ M.polish_hl = {
     ["@function.builtin"] = { bold = true },
     ["@function.call"] = { bold = true },
     ["@constructor"] = { fg = M.base_30.purple },
-    ["@parameter"] = { fg = M.base_30.white },
-    ["@namespace"] = { fg = M.base_30.deep_black },
+    ["@variable.parameter"] = { fg = M.base_30.white },
+    ["@module"] = { fg = M.base_30.deep_black },
     ["@symbol"] = { fg = M.base_30.purple },
     ["@keyword"] = { fg = M.base_30.purple },
-    ["@method.call"] = { bold = true },
+    ["@function.method.call"] = { bold = true },
   },
 
   telescope = {
diff --git a/lua/base46/themes/nightfox.lua b/lua/base46/themes/nightfox.lua
index 6f4fdea..db1e996 100644
--- a/lua/base46/themes/nightfox.lua
+++ b/lua/base46/themes/nightfox.lua
@@ -57,10 +57,10 @@ M.base_16 = {
 
 M.polish_hl = {
   treesitter = {
-    ["@field.key"] = { fg = M.base_16.base05 },
+    ["@variable.member.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 },
+    ["@variable.parameter"] = { fg = M.base_30.teal },
   },
 }
 
diff --git a/lua/base46/themes/nightowl.lua b/lua/base46/themes/nightowl.lua
index 5ffb18e..b3097a3 100644
--- a/lua/base46/themes/nightowl.lua
+++ b/lua/base46/themes/nightowl.lua
@@ -57,9 +57,9 @@ M.base_16 = {
 
 M.polish_hl = {
   treesitter = {
-    ["@parameter"] = { fg = M.base_30.orange },
+    ["@variable.parameter"] = { fg = M.base_30.orange },
     ["@keyword.return"] = { fg = M.base_30.cyan },
-    ["@conditional"] = { fg = M.base_30.cyan },
+    ["@keyword.conditional"] = { fg = M.base_30.cyan },
   },
 }
 
diff --git a/lua/base46/themes/oceanic-light.lua b/lua/base46/themes/oceanic-light.lua
index 64cc375..de7b8a7 100644
--- a/lua/base46/themes/oceanic-light.lua
+++ b/lua/base46/themes/oceanic-light.lua
@@ -67,7 +67,7 @@ M.polish_hl = {
   },
 
   treesitter = {
-    ["@field"] = { fg = M.base_16.base0C },
+    ["@variable.member"] = { fg = M.base_16.base0C },
   },
 
   syntax = {
diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index dcbf990..a90e2ff 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -58,7 +58,7 @@ M.base_16 = {
 
 M.polish_hl = {
   treesitter = {
-    ["@parameter"] = { fg = M.base_16.base0A },
+    ["@variable.parameter"] = { fg = M.base_16.base0A },
   },
 
   syntax = {
diff --git a/lua/base46/themes/palenight.lua b/lua/base46/themes/palenight.lua
index 0cdeda3..6664dbe 100644
--- a/lua/base46/themes/palenight.lua
+++ b/lua/base46/themes/palenight.lua
@@ -57,8 +57,8 @@ M.base_16 = {
 
 M.polish_hl = {
   treesitter = {
-    ["@include"] = { fg = M.base_30.purple },
-    ["@field.key"] = { fg = M.base_30.orange },
+    ["@keyword.import"] = { fg = M.base_30.purple },
+    ["@variable.member.key"] = { fg = M.base_30.orange },
   },
 }
 
diff --git a/lua/base46/themes/penumbra_dark.lua b/lua/base46/themes/penumbra_dark.lua
index f53adab..c8fe209 100644
--- a/lua/base46/themes/penumbra_dark.lua
+++ b/lua/base46/themes/penumbra_dark.lua
@@ -57,10 +57,10 @@ M.base_16 = {
 
 M.polish_hl = {
   treesitter = {
-    ["@field.key"] = { fg = M.base_30.red },
+    ["@variable.member.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 },
+    ["@variable.parameter"] = { fg = M.base_30.orange },
     ["@tag.delimiter"] = { fg = M.base_16.base08 },
     ["@tag.attribute"] = { link = "@annotation" },
   },
diff --git a/lua/base46/themes/penumbra_light.lua b/lua/base46/themes/penumbra_light.lua
index 8dc964a..19982e3 100644
--- a/lua/base46/themes/penumbra_light.lua
+++ b/lua/base46/themes/penumbra_light.lua
@@ -59,9 +59,9 @@ M.base_16 = {
 M.polish_hl = {
   treesitter = {
     ["@function.builtin"] = { fg = M.base_30.teal },
-    ["@field.key"] = { fg = M.base_30.red },
+    ["@variable.member.key"] = { fg = M.base_30.red },
     ["@punctuation.bracket"] = { fg = M.base_30.coal },
-    ["@field"] = { fg = M.base_30.coal },
+    ["@variable.member"] = { fg = M.base_30.coal },
   },
 
   syntax = {
diff --git a/lua/base46/themes/poimandres.lua b/lua/base46/themes/poimandres.lua
index 2d44ce4..7e17435 100644
--- a/lua/base46/themes/poimandres.lua
+++ b/lua/base46/themes/poimandres.lua
@@ -70,12 +70,11 @@ M.polish_hl = {
     ["@constructor"] = { fg = M.base_30.grey_fg },
     ["@property"] = { fg = M.base_30.seablue },
     ["@punctuation.delimiter"] = { fg = M.base_30.seablue },
-    ["@punctuation.special"] = { fg = M.base_30.purple },
+    ["@markup.list"] = { fg = M.base_30.purple },
     ["@punctuation.bracket"] = { fg = M.base_30.purple },
     ["@type.builtin"] = { link = "Boolean" },
     ["@tag.attribute"] = { fg = M.base_30.purple, italic = true, link = "" },
     ["Label"] = { fg = M.base_30.seablue },
-    ["@none"] = { fg = M.base_30.dark_purple },
     ["@constructor.tsx"] = { link = "Tag" },
   },
 
diff --git a/lua/base46/themes/tokyonight.lua b/lua/base46/themes/tokyonight.lua
index ce9afa0..fda29af 100644
--- a/lua/base46/themes/tokyonight.lua
+++ b/lua/base46/themes/tokyonight.lua
@@ -59,10 +59,10 @@ M.polish_hl = {
   treesitter = {
     ["@variable"] = { fg = M.base_16.base05 },
     ["@punctuation.bracket"] = { fg = M.base_30.purple },
-    ["@method.call"] = { fg = M.base_30.red },
+    ["@function.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 },
+    ["@variable.parameter"] = { fg = M.base_30.orange },
   },
 }
 
diff --git a/lua/base46/themes/tundra.lua b/lua/base46/themes/tundra.lua
index 76b4f49..26231a2 100644
--- a/lua/base46/themes/tundra.lua
+++ b/lua/base46/themes/tundra.lua
@@ -62,7 +62,7 @@ M.polish_hl = {
   treesitter = {
     ["@constructor"] = { fg = M.base_30.cyan },
     ["@keyword"] = { fg = M.base_30.red },
-    ["@method.call"] = { fg = M.base_30.cyan },
+    ["@function.method.call"] = { fg = M.base_30.cyan },
     ["@function.call"] = { fg = M.base_30.cyan },
     ["@function.builtin"] = { fg = M.base_30.orange },
   },
diff --git a/lua/base46/themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua
index 9c427fd..fca6798 100644
--- a/lua/base46/themes/vscode_dark.lua
+++ b/lua/base46/themes/vscode_dark.lua
@@ -59,10 +59,10 @@ M.base_16 = {
 
 M.polish_hl = {
   treesitter = {
-    ["@parameter"] = { fg = M.base_30.blue },
+    ["@variable.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 },
+    ["@variable.member.key"] = { fg = M.base_30.green1 },
     ["@keyword.return"] = { fg = M.base_16.base0E },
     ["@keyword.function"] = { fg = M.base_30.teal },
   },