diff --git a/lua/zenbones/specs/dark.lua b/lua/zenbones/specs/dark.lua
index d7dce3b..56f071a 100644
--- a/lua/zenbones/specs/dark.lua
+++ b/lua/zenbones/specs/dark.lua
@@ -191,116 +191,163 @@ local function generate(p, opt)
 			DiagnosticUnderlineOk      { fg = opt.colorize_diagnostic_underline_text and DiagnosticOk.fg or "NONE", gui = "undercurl", sp = DiagnosticOk.fg },
 
 			-- Tree-sitter
-			sym "@annotation"            { PreProc },
-			sym "@attribute"             { PreProc },
-			sym "@boolean"               { Number },
-			sym "@character"             { Constant },
-			sym "@character.special"     { Special },
-			sym "@comment"               { Comment },
-			sym "@conditional"           { Statement },
-			sym "@constant"              { Identifier, gui = "bold" },
-			sym "@constant.builtin"      { Number },
-			sym "@constant.macro"        { Number },
-			sym "@constructor"           { Special },
-			sym "@debug"                 { Special },
-			sym "@define"                { PreProc },
-			sym "@exception"             { Statement },
-			sym "@field"                 { Identifier },
-			sym "@float"                 { Number },
-			sym "@function"              { Function },
-			sym "@function.builtin"      { Special },
-			sym "@function.call"         { Function },
-			sym "@function.macro"        { PreProc },
-			sym "@include"               { PreProc },
-			sym "@keyword"               { Statement },
-			sym "@keyword.function"      { Statement },
-			sym "@keyword.operator"      { Statement },
-			sym "@keyword.return"        { Statement },
-			sym "@keyword.coroutine"     { Statement },
-			sym "@label"                 { Statement },
-			sym "@method"                { Function },
-			sym "@method.call"           { Function },
-			sym "@namespace"             { Special },
-			sym "@none"                  { },
-			sym "@number"                { Number },
-			sym "@operator"              { Statement },
-			sym "@parameter"             { Identifier },
-			sym "@parameter.reference"   { sym "@parameter" },
-			sym "@preproc"               { PreProc },
-			sym "@property"              { Identifier },
-			sym "@punctuation.bracket"   { Delimiter },
-			sym "@punctuation.delimiter" { Delimiter },
-			sym "@punctuation.special"   { Delimiter },
-			sym "@repeat"                { Statement },
-			sym "@storageclass"          { Type },
-			sym "@string"                { Constant },
-			sym "@string.escape"         { Special },
-			sym "@string.regex"          { Constant },
-			sym "@string.special"        { Special },
-			sym "@symbol"                { Identifier },
-			sym "@tag"                   { Special },
-			sym "@tag.attribute"         { sym "@property" },
-			sym "@tag.delimiter"         { Delimiter },
-			sym "@text"                  { sym "@none" },
-			sym "@text.danger"           { Error },
-			sym "@text.emphasis"         { Italic },
-			sym "@text.environment"      { PreProc },
-			sym "@text.environment.name" { Type },
-			sym "@text.literal"          { Constant },
-			sym "@text.math"             { Special },
-			sym "@text.note"             { DiagnosticInfo },
-			sym "@text.reference"        { Constant },
-			sym "@text.strike"           { gui = "strikethrough" },
-			sym "@text.strong"           { Bold },
-			sym "@text.title"            { Title },
-			sym "@text.underline"        { Underlined },
-			sym "@text.uri"              { Underlined },
-			sym "@text.warning"          { WarningMsg },
-			sym "@todo"                  { Todo },
-			sym "@type"                  { Type },
-			sym "@type.builtin"          { Type },
-			sym "@type.definition"       { Type },
-			sym "@type.qualifier"        { Type },
-			sym "@variable"              { Identifier },
-			sym "@variable.builtin"      { Number },
+			sym "@variable"                     { Identifier },
+			sym "@variable.builtin"             { Number },
+			sym "@variable.parameter"           { sym "@variable" },
+			sym "@variable.member"              { sym "@variable" },
+
+			sym "@constant"                     { Identifier, gui = "bold" },
+			sym "@constant.builtin"             { Number },
+			sym "@constant.macro"               { Number },
+
+			sym "@module"                       { Number },
+			sym "@module.builtin"               { sym "@module" },
+			sym "@label"                        { Statement },
+
+			sym "@string"                       { Constant },
+			sym "@string.documentation"         { sym "@string" },
+			sym "@string.regexp"                { Constant },
+			sym "@string.escape"                { Special },
+			sym "@string.special"               { Special },
+			sym "@string.special.symbol"        { Identifier },
+			sym "@string.special.url"           { sym "@string.special" },
+			sym "@string.special.path"          { sym "@string.special" },
+
+			sym "@character"                    { Constant },
+			sym "@character.special"            { Special },
+
+			sym "@boolean"                      { Number },
+			sym "@number"                       { Number },
+			sym "@number.float"                 { sym "@number" },
+
+			sym "@type"                         { Type },
+			sym "@type.builtin"                 { sym "@type" },
+			sym "@type.definition"              { sym "@type" },
+			sym "@type.qualifier"               { sym "@type" },
+
+			sym "@attribute"                    { PreProc },
+			sym "@property"                     { Identifier },
+
+			sym "@function"                     { Function },
+			sym "@function.builtin"             { Special },
+			sym "@function.call"                { sym "@function" },
+			sym "@function.macro"               { PreProc },
+
+			sym "@function.method"              { sym "@function" },
+			sym "@function.method.call"         { sym "@function" },
+
+			sym "@constructor"                  { Special },
+			sym "@operator"                     { Statement },
+
+			sym "@keyword.coroutine"            { Statement },
+			sym "@keyword.function"             { Statement },
+			sym "@keyword.operator"             { Statement },
+			sym "@keyword.import"               { PreProc },
+			sym "@keyword.storage"              { Type },
+			sym "@keyword.repeat"               { Statement },
+			sym "@keyword.return"               { Statement },
+			sym "@keyword.debug"                { Special },
+			sym "@keyword.exception"            { Statement },
+
+			sym "@keyword.conditional"          { Statement },
+			sym "@keyword.conditional.ternary"  { sym "@keyword.conditional" },
+			sym "@keyword.directive"            { PreProc },
+			sym "@keyword.directive.define"     { sym "@keyword.directive" },
+
+			sym "@punctuation.delimiter"        { Delimiter },
+			sym "@punctuation.bracket"          { Delimiter },
+			sym "@punctuation.special"          { Delimiter },
+
+			sym "@comment"                      { Comment },
+			sym "@comment.documentation"        { sym "@comment" },
+
+			sym "@comment.error"                { Error },
+			sym "@comment.warning"              { WarningMsg },
+			sym "@comment.todo"                 { Todo },
+			sym "@comment.note"                 { DiagnosticInfo },
+
+			sym "@markup.strong"                { Bold },
+			sym "@markup.itailc"                { Italic },
+			sym "@markup.strikethrough"         { gui = "strikethrough" },
+			sym "@markup.underline"             { Underlined },
+
+			sym "@markup.heading"               { Title },
+
+			sym "@markup.quote"                 { fg = p1.fg4 },
+			sym "@markup.math"                  { Special },
+			sym "@markup.environment"           { PreProc },
+
+			sym "@markup.link"                  { Constant },
+			sym "@markup.link.label"            { Special },
+			sym "@markup.link.url"              { Constant },
+
+			sym "@markup.raw"                   { Constant },
+			sym "@markup.raw.block"             { sym "@markup.raw" },
+
+			sym "@markup.list"                  { Special },
+			sym "@markup.list.checked"          { sym "@markup.list" },
+			sym "@markup.list.unchecked"        { sym "@markup.list" },
+
+			sym "@diff.plus"                    { fg = p.leaf },
+			sym "@diff.minus"                   { fg = p.rose },
+			sym "@diff.delta"                   { fg = p.water },
+
+			sym "@tag"                          { Special },
+			sym "@tag.attribute"                { sym "@property" },
+			sym "@tag.delimiter"                { Delimiter },
+
+			sym "@none"                         { },
 
 			sym "@punctuation.special.markdown" { Special },
 			sym "@string.escape.markdown"       { SpecialKey },
-			sym "@text.reference.markdown"      { Identifier, gui = "underline" },
-			sym "@text.emphasis.markdown"       { Italic },
-			sym "@text.title.markdown"          { Statement },
-			sym "@text.literal.markdown"        { Type },
-			sym "@text.uri.markdown"            { SpecialComment },
+			sym "@markup.link.markdown"         { Identifier, gui = "underline" },
+			sym "@markup.italic.markdown"       { Italic },
+			sym "@markup.title.markdown"        { Statement },
+			sym "@markup.raw.markdown"          { Type },
+			sym "@markup.link.url.markdown"     { SpecialComment },
 
 			-- LSP Semantic Token Groups
-			sym "@lsp.type.boolean"                    { sym "@boolean" },
-			sym "@lsp.type.builtinType"                { sym "@type.builtin" },
-			sym "@lsp.type.comment"                    { sym "@comment" },
-			sym "@lsp.type.enum"                       { sym "@type" },
-			sym "@lsp.type.enumMember"                 { sym "@constant" },
-			sym "@lsp.type.escapeSequence"             { sym "@string.escape" },
-			sym "@lsp.type.formatSpecifier"            { sym "@punctuation.special" },
-			sym "@lsp.type.keyword"                    { sym "@keyword" },
-			sym "@lsp.type.namespace"                  { sym "@namespace" },
-			sym "@lsp.type.number"                     { sym "@number" },
-			sym "@lsp.type.parameter"                  { sym "@parameter" },
-			sym "@lsp.type.property"                   { sym "@property" },
-			sym "@lsp.type.selfKeyword"                { sym "@variable.builtin" },
-			sym "@lsp.type.string.rust"                { sym "@string" },
-			sym "@lsp.type.typeAlias"                  { sym "@type.definition" },
-			sym "@lsp.type.unresolvedReference"        { gui = "undercurl", sp = Error.fg },
-			sym "@lsp.type.variable"                   { sym "@variable" },
-			sym "@lsp.typemod.class.defaultLibrary"    { sym "@type.builtin" },
-			sym "@lsp.typemod.enum.defaultLibrary"     { sym "@type.builtin" },
-			sym "@lsp.typemod.enumMember.defaultLibrary" { sym "@constant.builtin" },
-			sym "@lsp.typemod.method.defaultLibrary"   { sym "@function.builtin" },
-			sym "@lsp.typemod.function.defaultLibrary" { sym "@function.builtin" },
-			sym "@lsp.typemod.macro.defaultLibrary"    { sym "@function.builtin" },
-			sym "@lsp.typemod.keyword.async"           { sym "@keyword.coroutine" },
-			sym "@lsp.typemod.operator.injected"       { sym "@operator" },
-			sym "@lsp.typemod.string.injected"         { sym "@string" },
-			sym "@lsp.typemod.variable.defaultLibrary" { sym "@variable.builtin" },
-			sym "@lsp.typemod.variable.injected"       { sym "@variable" },
+			sym "@lsp.type.boolean"                       { sym "@boolean" },
+			sym "@lsp.type.builtinType"                   { sym "@type.builtin" },
+			sym "@lsp.type.comment"                       { sym "@comment" },
+			sym "@lsp.type.decorator"                     { sym "@attribute" },
+			sym "@lsp.type.deriveHelper"                  { sym "@attribute" },
+			sym "@lsp.type.enum"                          { sym "@type" },
+			sym "@lsp.type.enumMember"                    { sym "@constant" },
+			sym "@lsp.type.escapeSequence"                { sym "@string.escape" },
+			sym "@lsp.type.formatSpecifier"               { sym "@markup.list" },
+			sym "@lsp.type.generic"                       { sym "@variable" },
+			sym "@lsp.type.interface"                     { sym "@type" },
+			sym "@lsp.type.keyword"                       { Statement },
+			sym "@lsp.type.lifetime"                      { sym "@keyword.storage" },
+			sym "@lsp.type.namespace"                     { sym "@module" },
+			sym "@lsp.type.number"                        { sym "@number" },
+			sym "@lsp.type.operator"                      { sym "@operator" },
+			sym "@lsp.type.parameter"                     { sym "@variable.parameter" },
+			sym "@lsp.type.property"                      { sym "@property" },
+			sym "@lsp.type.selfKeyword"                   { sym "@variable.builtin" },
+			sym "@lsp.type.selfTypeKeyword"               { sym "@variable.builtin" },
+			sym "@lsp.type.string"                        { sym "@string" },
+			sym "@lsp.type.typeAlias"                     { sym "@type.definition" },
+			sym "@lsp.type.unresolvedReference"           { gui = "undercurl", sp = Error.fg },
+			sym "@lsp.type.variable"                      { },
+			sym "@lsp.typemod.class.defaultLibrary"       { sym "@type.builtin" },
+			sym "@lsp.typemod.enum.defaultLibrary"        { sym "@type.builtin" },
+			sym "@lsp.typemod.enumMember.defaultLibrary"  { sym "@constant.builtin" },
+			sym "@lsp.typemod.function.defaultLibrary"    { sym "@function.builtin" },
+			sym "@lsp.typemod.keyword.async"              { sym "@keyword.coroutine" },
+			sym "@lsp.typemod.keyword.injected"           { Statement },
+			sym "@lsp.typemod.macro.defaultLibrary"       { sym "@function.builtin" },
+			sym "@lsp.typemod.method.defaultLibrary"      { sym "@function.builtin" },
+			sym "@lsp.typemod.operator.injected"          { sym "@operator" },
+			sym "@lsp.typemod.string.injected"            { sym "@string" },
+			sym "@lsp.typemod.struct.defaultLibrary"      { sym "@type.builtin" },
+			sym "@lsp.typemod.type.defaultLibrary"        { sym "@type" },
+			sym "@lsp.typemod.typeAlias.defaultLibrary"   { sym "@type" },
+			sym "@lsp.typemod.variable.callable"          { sym "@function" },
+			sym "@lsp.typemod.variable.defaultLibrary"    { sym "@variable.builtin" },
+			sym "@lsp.typemod.variable.injected"          { sym "@variable" },
+			sym "@lsp.typemod.variable.static"            { sym "@constant" },
 
 			-- Syntax
 			diffAdded                 { fg = p.leaf },
@@ -312,9 +359,6 @@ local function generate(p, opt)
 			diffLine                  { fg = p.blossom, gui = "bold" },
 			diffIndexLine             { fg = p.wood },
 
-			sym "@text.diff.add"      { diffAdded },
-			sym "@text.diff.delete"   { diffRemoved },
-
 			gitcommitOverflow         { WarningMsg },
 
 			markdownUrl               { SpecialComment },
diff --git a/lua/zenbones/specs/light.lua b/lua/zenbones/specs/light.lua
index 0574ddc..ccf7f60 100644
--- a/lua/zenbones/specs/light.lua
+++ b/lua/zenbones/specs/light.lua
@@ -188,119 +188,166 @@ local function generate(p, opt)
 			DiagnosticUnderlineWarn    { fg = opt.colorize_diagnostic_underline_text and DiagnosticWarn.fg or "NONE", gui = "undercurl", sp = DiagnosticWarn.fg },
 			DiagnosticUnderlineInfo    { fg = opt.colorize_diagnostic_underline_text and DiagnosticInfo.fg or "NONE", gui = "undercurl", sp = DiagnosticInfo.fg },
 			DiagnosticUnderlineHint    { fg = opt.colorize_diagnostic_underline_text and DiagnosticHint.fg or "NONE", gui = "undercurl", sp = DiagnosticHint.fg },
-			DiagnosticUnderlineOk    { fg = opt.colorize_diagnostic_underline_text and DiagnosticOk.fg or "NONE", gui = "undercurl", sp = DiagnosticOk.fg },
+			DiagnosticUnderlineOk      { fg = opt.colorize_diagnostic_underline_text and DiagnosticOk.fg or "NONE", gui = "undercurl", sp = DiagnosticOk.fg },
 
 			-- Tree-sitter
-			sym "@annotation"            { PreProc },
-			sym "@attribute"             { PreProc },
-			sym "@boolean"               { Number },
-			sym "@character"             { Constant },
-			sym "@character.special"     { Special },
-			sym "@comment"               { Comment },
-			sym "@conditional"           { Statement },
-			sym "@constant"              { Identifier, gui = "bold" },
-			sym "@constant.builtin"      { Number },
-			sym "@constant.macro"        { Number },
-			sym "@constructor"           { Special },
-			sym "@debug"                 { Special },
-			sym "@define"                { PreProc },
-			sym "@exception"             { Statement },
-			sym "@field"                 { Identifier },
-			sym "@float"                 { Number },
-			sym "@function"              { Function },
-			sym "@function.builtin"      { Special },
-			sym "@function.call"         { Function },
-			sym "@function.macro"        { PreProc },
-			sym "@include"               { PreProc },
-			sym "@keyword"               { Statement },
-			sym "@keyword.function"      { Statement },
-			sym "@keyword.operator"      { Statement },
-			sym "@keyword.return"        { Statement },
-			sym "@keyword.coroutine"     { Statement },
-			sym "@label"                 { Statement },
-			sym "@method"                { Function },
-			sym "@method.call"           { Function },
-			sym "@namespace"             { Special },
-			sym "@none"                  { },
-			sym "@number"                { Number },
-			sym "@operator"              { Statement },
-			sym "@parameter"             { Identifier },
-			sym "@parameter.reference"   { sym "@parameter" },
-			sym "@preproc"               { PreProc },
-			sym "@property"              { Identifier },
-			sym "@punctuation.bracket"   { Delimiter },
-			sym "@punctuation.delimiter" { Delimiter },
-			sym "@punctuation.special"   { Delimiter },
-			sym "@repeat"                { Statement },
-			sym "@storageclass"          { Type },
-			sym "@string"                { Constant },
-			sym "@string.escape"         { Special },
-			sym "@string.regex"          { Constant },
-			sym "@string.special"        { Special },
-			sym "@symbol"                { Identifier },
-			sym "@tag"                   { Special },
-			sym "@tag.attribute"         { sym "@property" },
-			sym "@tag.delimiter"         { Delimiter },
-			sym "@text"                  { sym "@none" },
-			sym "@text.danger"           { Error },
-			sym "@text.emphasis"         { Italic },
-			sym "@text.environment"      { PreProc },
-			sym "@text.environment.name" { Type },
-			sym "@text.literal"          { Constant },
-			sym "@text.math"             { Special },
-			sym "@text.note"             { DiagnosticInfo },
-			sym "@text.reference"        { Constant },
-			sym "@text.strike"           { gui = "strikethrough" },
-			sym "@text.strong"           { Bold },
-			sym "@text.title"            { Title },
-			sym "@text.underline"        { Underlined },
-			sym "@text.uri"              { Underlined },
-			sym "@text.warning"          { WarningMsg },
-			sym "@text.todo"             { Todo },
-			sym "@type"                  { Type },
-			sym "@type.builtin"          { Type },
-			sym "@type.definition"       { Type },
-			sym "@type.qualifier"        { Type },
-			sym "@variable"              { Identifier },
-			sym "@variable.builtin"      { Number },
+			sym "@variable"                     { Identifier },
+			sym "@variable.builtin"             { Number },
+			sym "@variable.parameter"           { sym "@variable" },
+			sym "@variable.member"              { sym "@variable" },
+
+			sym "@constant"                     { Identifier, gui = "bold" },
+			sym "@constant.builtin"             { Number },
+			sym "@constant.macro"               { Number },
+
+			sym "@module"                       { Number },
+			sym "@module.builtin"               { sym "@module" },
+			sym "@label"                        { Statement },
+
+			sym "@string"                       { Constant },
+			sym "@string.documentation"         { sym "@string" },
+			sym "@string.regexp"                { Constant },
+			sym "@string.escape"                { Special },
+			sym "@string.special"               { Special },
+			sym "@string.special.symbol"        { Identifier },
+			sym "@string.special.url"           { sym "@string.special" },
+			sym "@string.special.path"          { sym "@string.special" },
+
+			sym "@character"                    { Constant },
+			sym "@character.special"            { Special },
+
+			sym "@boolean"                      { Number },
+			sym "@number"                       { Number },
+			sym "@number.float"                 { sym "@number" },
+
+			sym "@type"                         { Type },
+			sym "@type.builtin"                 { sym "@type" },
+			sym "@type.definition"              { sym "@type" },
+			sym "@type.qualifier"               { sym "@type" },
+
+			sym "@attribute"                    { PreProc },
+			sym "@property"                     { Identifier },
+
+			sym "@function"                     { Function },
+			sym "@function.builtin"             { Special },
+			sym "@function.call"                { sym "@function" },
+			sym "@function.macro"               { PreProc },
+
+			sym "@function.method"              { sym "@function" },
+			sym "@function.method.call"         { sym "@function" },
+
+			sym "@constructor"                  { Special },
+			sym "@operator"                     { Statement },
+
+			sym "@keyword.coroutine"            { Statement },
+			sym "@keyword.function"             { Statement },
+			sym "@keyword.operator"             { Statement },
+			sym "@keyword.import"               { PreProc },
+			sym "@keyword.storage"              { Type },
+			sym "@keyword.repeat"               { Statement },
+			sym "@keyword.return"               { Statement },
+			sym "@keyword.debug"                { Special },
+			sym "@keyword.exception"            { Statement },
+
+			sym "@keyword.conditional"          { Statement },
+			sym "@keyword.conditional.ternary"  { sym "@keyword.conditional" },
+			sym "@keyword.directive"            { PreProc },
+			sym "@keyword.directive.define"     { sym "@keyword.directive" },
+
+			sym "@punctuation.delimiter"        { Delimiter },
+			sym "@punctuation.bracket"          { Delimiter },
+			sym "@punctuation.special"          { Delimiter },
+
+			sym "@comment"                      { Comment },
+			sym "@comment.documentation"        { sym "@comment" },
+
+			sym "@comment.error"                { Error },
+			sym "@comment.warning"              { WarningMsg },
+			sym "@comment.todo"                 { Todo },
+			sym "@comment.note"                 { DiagnosticInfo },
+
+			sym "@markup.strong"                { Bold },
+			sym "@markup.itailc"                { Italic },
+			sym "@markup.strikethrough"         { gui = "strikethrough" },
+			sym "@markup.underline"             { Underlined },
+
+			sym "@markup.heading"               { Title },
+
+			sym "@markup.quote"                 { fg = p1.fg4 },
+			sym "@markup.math"                  { Special },
+			sym "@markup.environment"           { PreProc },
+
+			sym "@markup.link"                  { Constant },
+			sym "@markup.link.label"            { Special },
+			sym "@markup.link.url"              { Constant },
+
+			sym "@markup.raw"                   { Constant },
+			sym "@markup.raw.block"             { sym "@markup.raw" },
+
+			sym "@markup.list"                  { Special },
+			sym "@markup.list.checked"          { sym "@markup.list" },
+			sym "@markup.list.unchecked"        { sym "@markup.list" },
+
+			sym "@diff.plus"                    { fg = p.leaf },
+			sym "@diff.minus"                   { fg = p.rose },
+			sym "@diff.delta"                   { fg = p.water },
+
+			sym "@tag"                          { Special },
+			sym "@tag.attribute"                { sym "@property" },
+			sym "@tag.delimiter"                { Delimiter },
+
+			sym "@none"                         { },
 
 			sym "@punctuation.special.markdown" { Special },
 			sym "@string.escape.markdown"       { SpecialKey },
-			sym "@text.reference.markdown"      { Identifier, gui = "underline" },
-			sym "@text.emphasis.markdown"       { Italic },
-			sym "@text.title.markdown"          { Statement },
-			sym "@text.literal.markdown"        { Type },
-			sym "@text.uri.markdown"            { SpecialComment },
+			sym "@markup.link.markdown"         { Identifier, gui = "underline" },
+			sym "@markup.italic.markdown"       { Italic },
+			sym "@markup.title.markdown"        { Statement },
+			sym "@markup.raw.markdown"          { Type },
+			sym "@markup.link.url.markdown"     { SpecialComment },
 
 			-- LSP Semantic Token Groups
-			sym "@lsp.type.boolean"                    { sym "@boolean" },
-			sym "@lsp.type.builtinType"                { sym "@type.builtin" },
-			sym "@lsp.type.comment"                    { sym "@comment" },
-			sym "@lsp.type.enum"                       { sym "@type" },
-			sym "@lsp.type.enumMember"                 { sym "@constant" },
-			sym "@lsp.type.escapeSequence"             { sym "@string.escape" },
-			sym "@lsp.type.formatSpecifier"            { sym "@punctuation.special" },
-			sym "@lsp.type.keyword"                    { sym "@keyword" },
-			sym "@lsp.type.namespace"                  { sym "@namespace" },
-			sym "@lsp.type.number"                     { sym "@number" },
-			sym "@lsp.type.parameter"                  { sym "@parameter" },
-			sym "@lsp.type.property"                   { sym "@property" },
-			sym "@lsp.type.selfKeyword"                { sym "@variable.builtin" },
-			sym "@lsp.type.string.rust"                { sym "@string" },
-			sym "@lsp.type.typeAlias"                  { sym "@type.definition" },
-			sym "@lsp.type.unresolvedReference"        { gui = "undercurl", sp = Error.fg },
-			sym "@lsp.type.variable"                   { sym "@variable" },
-			sym "@lsp.typemod.class.defaultLibrary"    { sym "@type.builtin" },
-			sym "@lsp.typemod.enum.defaultLibrary"     { sym "@type.builtin" },
-			sym "@lsp.typemod.enumMember.defaultLibrary" { sym "@constant.builtin" },
-			sym "@lsp.typemod.method.defaultLibrary"   { sym "@function.builtin" },
-			sym "@lsp.typemod.function.defaultLibrary" { sym "@function.builtin" },
-			sym "@lsp.typemod.macro.defaultLibrary"    { sym "@function.builtin" },
-			sym "@lsp.typemod.keyword.async"           { sym "@keyword.coroutine" },
-			sym "@lsp.typemod.operator.injected"       { sym "@operator" },
-			sym "@lsp.typemod.string.injected"         { sym "@string" },
-			sym "@lsp.typemod.variable.defaultLibrary" { sym "@variable.builtin" },
-			sym "@lsp.typemod.variable.injected"       { sym "@variable" },
+			sym "@lsp.type.boolean"                       { sym "@boolean" },
+			sym "@lsp.type.builtinType"                   { sym "@type.builtin" },
+			sym "@lsp.type.comment"                       { sym "@comment" },
+			sym "@lsp.type.decorator"                     { sym "@attribute" },
+			sym "@lsp.type.deriveHelper"                  { sym "@attribute" },
+			sym "@lsp.type.enum"                          { sym "@type" },
+			sym "@lsp.type.enumMember"                    { sym "@constant" },
+			sym "@lsp.type.escapeSequence"                { sym "@string.escape" },
+			sym "@lsp.type.formatSpecifier"               { sym "@markup.list" },
+			sym "@lsp.type.generic"                       { sym "@variable" },
+			sym "@lsp.type.interface"                     { sym "@type" },
+			sym "@lsp.type.keyword"                       { Statement },
+			sym "@lsp.type.lifetime"                      { sym "@keyword.storage" },
+			sym "@lsp.type.namespace"                     { sym "@module" },
+			sym "@lsp.type.number"                        { sym "@number" },
+			sym "@lsp.type.operator"                      { sym "@operator" },
+			sym "@lsp.type.parameter"                     { sym "@variable.parameter" },
+			sym "@lsp.type.property"                      { sym "@property" },
+			sym "@lsp.type.selfKeyword"                   { sym "@variable.builtin" },
+			sym "@lsp.type.selfTypeKeyword"               { sym "@variable.builtin" },
+			sym "@lsp.type.string"                        { sym "@string" },
+			sym "@lsp.type.typeAlias"                     { sym "@type.definition" },
+			sym "@lsp.type.unresolvedReference"           { gui = "undercurl", sp = Error.fg },
+			sym "@lsp.type.variable"                      { },
+			sym "@lsp.typemod.class.defaultLibrary"       { sym "@type.builtin" },
+			sym "@lsp.typemod.enum.defaultLibrary"        { sym "@type.builtin" },
+			sym "@lsp.typemod.enumMember.defaultLibrary"  { sym "@constant.builtin" },
+			sym "@lsp.typemod.function.defaultLibrary"    { sym "@function.builtin" },
+			sym "@lsp.typemod.keyword.async"              { sym "@keyword.coroutine" },
+			sym "@lsp.typemod.keyword.injected"           { Statement },
+			sym "@lsp.typemod.macro.defaultLibrary"       { sym "@function.builtin" },
+			sym "@lsp.typemod.method.defaultLibrary"      { sym "@function.builtin" },
+			sym "@lsp.typemod.operator.injected"          { sym "@operator" },
+			sym "@lsp.typemod.string.injected"            { sym "@string" },
+			sym "@lsp.typemod.struct.defaultLibrary"      { sym "@type.builtin" },
+			sym "@lsp.typemod.type.defaultLibrary"        { sym "@type" },
+			sym "@lsp.typemod.typeAlias.defaultLibrary"   { sym "@type" },
+			sym "@lsp.typemod.variable.callable"          { sym "@function" },
+			sym "@lsp.typemod.variable.defaultLibrary"    { sym "@variable.builtin" },
+			sym "@lsp.typemod.variable.injected"          { sym "@variable" },
+			sym "@lsp.typemod.variable.static"            { sym "@constant" },
 
 			-- Syntax
 			diffAdded                 { fg = p.leaf },
@@ -312,9 +359,6 @@ local function generate(p, opt)
 			diffLine                  { fg = p.blossom, gui = "bold" },
 			diffIndexLine             { fg = p.wood },
 
-			sym "@text.diff.add"      { diffAdded },
-			sym "@text.diff.delete"   { diffRemoved },
-
 			gitcommitOverflow         { WarningMsg },
 
 			markdownUrl               { SpecialComment },