diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index 6a73c4d..0b27d40 100644
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -26,13 +26,14 @@ jobs:
         run: git checkout -b ${VIMDOC_BRANCH}
 
       - name: panvimdoc
-        uses: kdheepak/panvimdoc@v2.7.3
+        uses: kdheepak/panvimdoc@v3.0.5
         with:
           # Output vimdoc project name
           vimdoc: zenbones
           pandoc: doc/zenbones.md
           description: "A collection of contrast-based vim/neovim colorschemes"
           version: "Vim 8.1 / Nvim v0.8.0"
+          treesitter: true
       - name: Create PR
         run: |
           if ! [[ -z $(git status -s) ]]; then
diff --git a/lua/zenbones/specs/dark.lua b/lua/zenbones/specs/dark.lua
index ecc16d3..b1b2c8f 100644
--- a/lua/zenbones/specs/dark.lua
+++ b/lua/zenbones/specs/dark.lua
@@ -168,6 +168,8 @@ local function generate(p, opt)
 			DiagnosticWarn             { WarningMsg },
 			DiagnosticInfo             { fg = p.water },
 			DiagnosticHint             { fg = p.blossom },
+			DiagnosticDeprecated       { DiagnosticWarn },
+			DiagnosticUnnecessary      { DiagnosticWarn },
 
 			DiagnosticSignError        { SignColumn, fg = DiagnosticError.fg },
 			DiagnosticSignWarn         { SignColumn, fg = DiagnosticWarn.fg },
@@ -265,6 +267,20 @@ local function generate(p, opt)
 			sym "@text.literal.markdown"        { Type },
 			sym "@text.uri.markdown"            { SpecialComment },
 
+			-- LSP Semantic Token Groups
+			sym "@lsp.type.comment"                    { sym "@comment" },
+			sym "@lsp.type.enum"                       { sym "@type" },
+			sym "@lsp.type.keyword"                    { sym "@keyword" },
+			sym "@lsp.type.namespace"                  { sym "@namespace" },
+			sym "@lsp.type.parameter"                  { sym "@parameter" },
+			sym "@lsp.type.property"                   { sym "@property" },
+			sym "@lsp.typemod.method.defaultLibrary"   { sym  "@function.builtin" },
+			sym "@lsp.typemod.function.defaultLibrary" { sym  "@function.builtin" },
+			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" },
+
 			-- Syntax
 			diffAdded                 { fg = p.leaf },
 			diffRemoved               { fg = p.rose },
diff --git a/lua/zenbones/specs/light.lua b/lua/zenbones/specs/light.lua
index 837306f..acef75c 100644
--- a/lua/zenbones/specs/light.lua
+++ b/lua/zenbones/specs/light.lua
@@ -168,6 +168,8 @@ local function generate(p, opt)
 			DiagnosticWarn             { WarningMsg },
 			DiagnosticInfo             { fg = p.water },
 			DiagnosticHint             { fg = p.blossom },
+			DiagnosticDeprecated       { DiagnosticWarn },
+			DiagnosticUnnecessary      { DiagnosticWarn },
 
 			DiagnosticSignError        { SignColumn, fg = DiagnosticError.fg },
 			DiagnosticSignWarn         { SignColumn, fg = DiagnosticWarn.fg },
@@ -265,6 +267,20 @@ local function generate(p, opt)
 			sym "@text.literal.markdown"        { Type },
 			sym "@text.uri.markdown"            { SpecialComment },
 
+			-- LSP Semantic Token Groups
+			sym "@lsp.type.comment"                    { sym "@comment" },
+			sym "@lsp.type.enum"                       { sym "@type" },
+			sym "@lsp.type.keyword"                    { sym "@keyword" },
+			sym "@lsp.type.namespace"                  { sym "@namespace" },
+			sym "@lsp.type.parameter"                  { sym "@parameter" },
+			sym "@lsp.type.property"                   { sym "@property" },
+			sym "@lsp.typemod.method.defaultLibrary"   { sym  "@function.builtin" },
+			sym "@lsp.typemod.function.defaultLibrary" { sym  "@function.builtin" },
+			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" },
+
 			-- Syntax
 			diffAdded                 { fg = p.leaf },
 			diffRemoved               { fg = p.rose },