diff --git a/extras/helix/tokyonight_day.toml b/extras/helix/tokyonight_day.toml
index 2e43ff0..ced7253 100644
--- a/extras/helix/tokyonight_day.toml
+++ b/extras/helix/tokyonight_day.toml
@@ -50,13 +50,13 @@ label = { fg = "#2e7de9" }
 "markup.normal.hover" = { fg = "#6172b0" }
 "markup.raw" = { fg = "#118c74" }
 "markup.raw.block" = { fg = "#118c74" }
-"markup.raw.inline" = { bg = "#a1a6c5", fg = "#2e7de9" }
+"markup.raw.inline" = 
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-namespace = { fg = "#007197" }
+namespace = { fg = "#9854f1" }
 operator = { fg = "#006a83" }
 special = { fg = "#188092" }
 string = { fg = "#587539" }
-"string.regexp" = { fg = "#2e5857" }
+"string.regexp" = 
 "string.special" = { fg = "#188092" }
 tag = { fg = "#9854f1" }
 type = { fg = "#188092" }
@@ -84,8 +84,8 @@ type = { fg = "#188092" }
 "ui.window" = { fg = "#e9e9ed", modifiers = ["bold"] }
 variable = { fg = "#3760bf" }
 "variable.builtin" = { fg = "#f52a65" }
-"variable.other.member" = { fg = "#387068" }
-"variable.parameter" = { fg = "#8c6c3e" }
+"variable.other.member" = { fg = "#9854f1" }
+"variable.parameter" = { fg = "#9854f1" }
 warning = { fg = "#8c6c3e" }
 
 [palette]
@@ -144,5 +144,6 @@ red = "#f52a65"
 red1 = "#c64343"
 teal = "#118c74"
 terminal_black = "#a1a6c5"
+todo = "#2e7de9"
 warning = "#8c6c3e"
 yellow = "#8c6c3e"
\ No newline at end of file
diff --git a/extras/helix/tokyonight_moon.toml b/extras/helix/tokyonight_moon.toml
index bd3b35b..eed43d9 100644
--- a/extras/helix/tokyonight_moon.toml
+++ b/extras/helix/tokyonight_moon.toml
@@ -50,13 +50,13 @@ label = { fg = "#82aaff" }
 "markup.normal.hover" = { fg = "#828bb8" }
 "markup.raw" = { fg = "#4fd6be" }
 "markup.raw.block" = { fg = "#4fd6be" }
-"markup.raw.inline" = { bg = "#444a73", fg = "#82aaff" }
+"markup.raw.inline" = 
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-namespace = { fg = "#86e1fc" }
+namespace = { fg = "#c099ff" }
 operator = { fg = "#89ddff" }
 special = { fg = "#65bcff" }
 string = { fg = "#c3e88d" }
-"string.regexp" = { fg = "#b4f9f8" }
+"string.regexp" = 
 "string.special" = { fg = "#65bcff" }
 tag = { fg = "#c099ff" }
 type = { fg = "#65bcff" }
@@ -84,8 +84,8 @@ type = { fg = "#65bcff" }
 "ui.window" = { fg = "#1b1d2b", modifiers = ["bold"] }
 variable = { fg = "#c8d3f5" }
 "variable.builtin" = { fg = "#ff757f" }
-"variable.other.member" = { fg = "#4fd6be" }
-"variable.parameter" = { fg = "#ffc777" }
+"variable.other.member" = { fg = "#c099ff" }
+"variable.parameter" = { fg = "#c099ff" }
 warning = { fg = "#ffc777" }
 
 [palette]
@@ -144,5 +144,6 @@ red = "#ff757f"
 red1 = "#c53b53"
 teal = "#4fd6be"
 terminal_black = "#444a73"
+todo = "#82aaff"
 warning = "#ffc777"
 yellow = "#ffc777"
\ No newline at end of file
diff --git a/extras/helix/tokyonight_night.toml b/extras/helix/tokyonight_night.toml
index 4803426..d23c3db 100644
--- a/extras/helix/tokyonight_night.toml
+++ b/extras/helix/tokyonight_night.toml
@@ -50,13 +50,13 @@ label = { fg = "#7aa2f7" }
 "markup.normal.hover" = { fg = "#a9b1d6" }
 "markup.raw" = { fg = "#1abc9c" }
 "markup.raw.block" = { fg = "#1abc9c" }
-"markup.raw.inline" = { bg = "#414868", fg = "#7aa2f7" }
+"markup.raw.inline" = 
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-namespace = { fg = "#7dcfff" }
+namespace = { fg = "#bb9af7" }
 operator = { fg = "#89ddff" }
 special = { fg = "#2ac3de" }
 string = { fg = "#9ece6a" }
-"string.regexp" = { fg = "#b4f9f8" }
+"string.regexp" = 
 "string.special" = { fg = "#2ac3de" }
 tag = { fg = "#bb9af7" }
 type = { fg = "#2ac3de" }
@@ -84,8 +84,8 @@ type = { fg = "#2ac3de" }
 "ui.window" = { fg = "#15161e", modifiers = ["bold"] }
 variable = { fg = "#c0caf5" }
 "variable.builtin" = { fg = "#f7768e" }
-"variable.other.member" = { fg = "#73daca" }
-"variable.parameter" = { fg = "#e0af68" }
+"variable.other.member" = { fg = "#bb9af7" }
+"variable.parameter" = { fg = "#bb9af7" }
 warning = { fg = "#e0af68" }
 
 [palette]
@@ -144,5 +144,6 @@ red = "#f7768e"
 red1 = "#db4b4b"
 teal = "#1abc9c"
 terminal_black = "#414868"
+todo = "#7aa2f7"
 warning = "#e0af68"
 yellow = "#e0af68"
\ No newline at end of file
diff --git a/extras/helix/tokyonight_storm.toml b/extras/helix/tokyonight_storm.toml
index 4c2f334..e67a0ea 100644
--- a/extras/helix/tokyonight_storm.toml
+++ b/extras/helix/tokyonight_storm.toml
@@ -50,13 +50,13 @@ label = { fg = "#7aa2f7" }
 "markup.normal.hover" = { fg = "#a9b1d6" }
 "markup.raw" = { fg = "#1abc9c" }
 "markup.raw.block" = { fg = "#1abc9c" }
-"markup.raw.inline" = { bg = "#414868", fg = "#7aa2f7" }
+"markup.raw.inline" = 
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-namespace = { fg = "#7dcfff" }
+namespace = { fg = "#bb9af7" }
 operator = { fg = "#89ddff" }
 special = { fg = "#2ac3de" }
 string = { fg = "#9ece6a" }
-"string.regexp" = { fg = "#b4f9f8" }
+"string.regexp" = 
 "string.special" = { fg = "#2ac3de" }
 tag = { fg = "#bb9af7" }
 type = { fg = "#2ac3de" }
@@ -84,8 +84,8 @@ type = { fg = "#2ac3de" }
 "ui.window" = { fg = "#1d202f", modifiers = ["bold"] }
 variable = { fg = "#c0caf5" }
 "variable.builtin" = { fg = "#f7768e" }
-"variable.other.member" = { fg = "#73daca" }
-"variable.parameter" = { fg = "#e0af68" }
+"variable.other.member" = { fg = "#bb9af7" }
+"variable.parameter" = { fg = "#bb9af7" }
 warning = { fg = "#e0af68" }
 
 [palette]
@@ -144,5 +144,6 @@ red = "#f7768e"
 red1 = "#db4b4b"
 teal = "#1abc9c"
 terminal_black = "#414868"
+todo = "#7aa2f7"
 warning = "#e0af68"
 yellow = "#e0af68"
\ No newline at end of file
diff --git a/extras/lua/tokyonight_day.lua b/extras/lua/tokyonight_day.lua
index 7ee8510..464930e 100644
--- a/extras/lua/tokyonight_day.lua
+++ b/extras/lua/tokyonight_day.lua
@@ -64,19 +64,86 @@ local colors = {
   red1 = "#c64343",
   teal = "#118c74",
   terminal_black = "#a1a6c5",
+  todo = "#2e7de9",
   warning = "#8c6c3e",
   yellow = "#8c6c3e"
 }
 
 local highlights = {
+  ["@annotation"] = {
+    link = "PreProc"
+  },
+  ["@attribute"] = {
+    link = "PreProc"
+  },
+  ["@boolean"] = {
+    link = "Boolean"
+  },
+  ["@character"] = {
+    link = "Character"
+  },
+  ["@character.special"] = {
+    link = "SpecialChar"
+  },
+  ["@comment"] = {
+    link = "Comment"
+  },
+  ["@comment.error"] = {
+    fg = "#c64343"
+  },
+  ["@comment.hint"] = {
+    fg = "#118c74"
+  },
+  ["@comment.info"] = {
+    fg = "#07879d"
+  },
+  ["@comment.todo"] = {
+    fg = "#2e7de9"
+  },
+  ["@comment.warning"] = {
+    fg = "#8c6c3e"
+  },
+  ["@constant"] = {
+    link = "Constant"
+  },
+  ["@constant.builtin"] = {
+    link = "Special"
+  },
+  ["@constant.macro"] = {
+    link = "Define"
+  },
   ["@constructor"] = {
     fg = "#9854f1"
   },
   ["@constructor.tsx"] = {
     fg = "#188092"
   },
-  ["@field"] = {
-    fg = "#387068"
+  ["@diff.delta"] = {
+    link = "DiffChange"
+  },
+  ["@diff.minus"] = {
+    link = "DiffDelete"
+  },
+  ["@diff.plus"] = {
+    link = "DiffAdd"
+  },
+  ["@function"] = {
+    link = "Function"
+  },
+  ["@function.builtin"] = {
+    link = "Special"
+  },
+  ["@function.call"] = {
+    link = "@function"
+  },
+  ["@function.macro"] = {
+    link = "Macro"
+  },
+  ["@function.method"] = {
+    link = "Function"
+  },
+  ["@function.method.call"] = {
+    link = "@function.method"
   },
   ["@keyword"] = {
     fg = "#7847bd",
@@ -84,10 +151,43 @@ local highlights = {
       italic = true
     }
   },
+  ["@keyword.conditional"] = {
+    link = "Conditional"
+  },
+  ["@keyword.coroutine"] = {
+    link = "@keyword"
+  },
+  ["@keyword.debug"] = {
+    link = "Debug"
+  },
+  ["@keyword.directive"] = {
+    link = "PreProc"
+  },
+  ["@keyword.directive.define"] = {
+    link = "Define"
+  },
+  ["@keyword.exception"] = {
+    link = "Exception"
+  },
   ["@keyword.function"] = {
     fg = "#9854f1",
     style = {}
   },
+  ["@keyword.import"] = {
+    link = "Include"
+  },
+  ["@keyword.operator"] = {
+    link = "@operator"
+  },
+  ["@keyword.repeat"] = {
+    link = "Repeat"
+  },
+  ["@keyword.return"] = {
+    link = "@keyword"
+  },
+  ["@keyword.storage"] = {
+    link = "StorageClass"
+  },
   ["@label"] = {
     fg = "#2e7de9"
   },
@@ -116,7 +216,7 @@ local highlights = {
     link = "@string.escape"
   },
   ["@lsp.type.formatSpecifier"] = {
-    link = "@punctuation.special"
+    link = "@markup.list"
   },
   ["@lsp.type.generic"] = {
     link = "@variable"
@@ -128,10 +228,10 @@ local highlights = {
     link = "@keyword"
   },
   ["@lsp.type.lifetime"] = {
-    link = "@storageclass"
+    link = "@keyword.storage"
   },
   ["@lsp.type.namespace"] = {
-    link = "@namespace"
+    link = "@module"
   },
   ["@lsp.type.number"] = {
     link = "@number"
@@ -140,7 +240,7 @@ local highlights = {
     link = "@operator"
   },
   ["@lsp.type.parameter"] = {
-    link = "@parameter"
+    link = "@variable.parameter"
   },
   ["@lsp.type.property"] = {
     link = "@property"
@@ -213,21 +313,105 @@ local highlights = {
   ["@lsp.typemod.variable.static"] = {
     link = "@constant"
   },
-  ["@namespace"] = {
+  ["@markup"] = {
+    link = "@none"
+  },
+  ["@markup.emphasis"] = {
+    italic = true
+  },
+  ["@markup.environment"] = {
+    link = "Macro"
+  },
+  ["@markup.environment.name"] = {
+    link = "Type"
+  },
+  ["@markup.heading"] = {
+    link = "Title"
+  },
+  ["@markup.heading.1.markdown"] = {
+    bold = true,
+    fg = "#2e7de9"
+  },
+  ["@markup.heading.2.markdown"] = {
+    bold = true,
+    fg = "#8c6c3e"
+  },
+  ["@markup.heading.3.markdown"] = {
+    bold = true,
+    fg = "#587539"
+  },
+  ["@markup.heading.4.markdown"] = {
+    bold = true,
+    fg = "#118c74"
+  },
+  ["@markup.heading.5.markdown"] = {
+    bold = true,
+    fg = "#9854f1"
+  },
+  ["@markup.heading.6.markdown"] = {
+    bold = true,
+    fg = "#7847bd"
+  },
+  ["@markup.link"] = {
+    fg = "#118c74"
+  },
+  ["@markup.link.label"] = {
+    link = "SpecialChar"
+  },
+  ["@markup.link.label.symbol"] = {
+    link = "Identifier"
+  },
+  ["@markup.link.url"] = {
+    link = "Underlined"
+  },
+  ["@markup.list"] = {
+    fg = "#006a83"
+  },
+  ["@markup.list.checked"] = {
+    fg = "#387068"
+  },
+  ["@markup.list.markdown"] = {
+    bold = true,
+    fg = "#b15c00"
+  },
+  ["@markup.list.unchecked"] = {
+    fg = "#2e7de9"
+  },
+  ["@markup.math"] = {
+    link = "Special"
+  },
+  ["@markup.raw"] = {
+    link = "String"
+  },
+  ["@markup.raw.markdown_inline"] = {
+    bg = "#a1a6c5",
+    fg = "#2e7de9"
+  },
+  ["@markup.strikethrough"] = {
+    strikethrough = true
+  },
+  ["@markup.strong"] = {
+    bold = true
+  },
+  ["@markup.underline"] = {
+    underline = true
+  },
+  ["@module"] = {
     link = "Include"
   },
-  ["@namespace.builtin"] = {
+  ["@module.builtin"] = {
     fg = "#f52a65"
   },
+  ["@none"] = {},
+  ["@number"] = {
+    link = "Number"
+  },
+  ["@number.float"] = {
+    link = "Float"
+  },
   ["@operator"] = {
     fg = "#006a83"
   },
-  ["@parameter"] = {
-    fg = "#8c6c3e"
-  },
-  ["@parameter.builtin"] = {
-    fg = "#7b6545"
-  },
   ["@property"] = {
     fg = "#387068"
   },
@@ -237,12 +421,8 @@ local highlights = {
   ["@punctuation.delimiter"] = {
     fg = "#006a83"
   },
-  ["@punctuation.special"] = {
-    fg = "#006a83"
-  },
-  ["@punctuation.special.markdown"] = {
-    bold = true,
-    fg = "#b15c00"
+  ["@string"] = {
+    link = "String"
   },
   ["@string.documentation"] = {
     fg = "#8c6c3e"
@@ -250,69 +430,36 @@ local highlights = {
   ["@string.escape"] = {
     fg = "#9854f1"
   },
-  ["@string.regex"] = {
+  ["@string.regexp"] = {
     fg = "#2e5857"
   },
+  ["@tag"] = {
+    link = "Label"
+  },
+  ["@tag.attribute"] = {
+    link = "@property"
+  },
+  ["@tag.delimiter"] = {
+    link = "Delimiter"
+  },
   ["@tag.delimiter.tsx"] = {
     fg = "#5772ad"
   },
   ["@tag.tsx"] = {
     fg = "#f52a65"
   },
-  ["@text.danger"] = {
-    bg = "#c64343",
-    fg = "#e1e2e7"
-  },
-  ["@text.diff.add"] = {
-    link = "DiffAdd"
-  },
-  ["@text.diff.delete"] = {
-    link = "DiffDelete"
-  },
-  ["@text.literal.markdown_inline"] = {
-    bg = "#a1a6c5",
-    fg = "#2e7de9"
-  },
-  ["@text.reference"] = {
-    fg = "#118c74"
-  },
-  ["@text.title.1.markdown"] = {
-    bold = true,
-    fg = "#2e7de9"
-  },
-  ["@text.title.2.markdown"] = {
-    bold = true,
-    fg = "#8c6c3e"
-  },
-  ["@text.title.3.markdown"] = {
-    bold = true,
-    fg = "#587539"
-  },
-  ["@text.title.4.markdown"] = {
-    bold = true,
-    fg = "#118c74"
-  },
-  ["@text.title.5.markdown"] = {
-    bold = true,
-    fg = "#9854f1"
-  },
-  ["@text.title.6.markdown"] = {
-    bold = true,
-    fg = "#7847bd"
-  },
-  ["@text.todo.checked"] = {
-    fg = "#387068"
-  },
-  ["@text.todo.unchecked"] = {
-    fg = "#2e7de9"
-  },
-  ["@text.warning"] = {
-    bg = "#8c6c3e",
-    fg = "#e1e2e7"
+  ["@type"] = {
+    link = "Type"
   },
   ["@type.builtin"] = {
     fg = "#2496ac"
   },
+  ["@type.definition"] = {
+    link = "Typedef"
+  },
+  ["@type.qualifier"] = {
+    link = "@keyword"
+  },
   ["@variable"] = {
     fg = "#3760bf",
     style = {}
@@ -320,6 +467,15 @@ local highlights = {
   ["@variable.builtin"] = {
     fg = "#f52a65"
   },
+  ["@variable.member"] = {
+    fg = "#387068"
+  },
+  ["@variable.parameter"] = {
+    fg = "#8c6c3e"
+  },
+  ["@variable.parameter.builtin"] = {
+    fg = "#7b6545"
+  },
   ALEErrorSign = {
     fg = "#c64343"
   },
@@ -1195,7 +1351,7 @@ local highlights = {
     link = "Special"
   },
   LspKindField = {
-    link = "@field"
+    link = "@variable.member"
   },
   LspKindFile = {
     link = "Normal"
@@ -1210,19 +1366,19 @@ local highlights = {
     link = "@lsp.type.interface"
   },
   LspKindKey = {
-    link = "@field"
+    link = "@variable.member"
   },
   LspKindKeyword = {
     link = "@lsp.type.keyword"
   },
   LspKindMethod = {
-    link = "@method"
+    link = "@function.method"
   },
   LspKindModule = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindNamespace = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindNull = {
     link = "@constant.builtin"
@@ -1237,13 +1393,13 @@ local highlights = {
     link = "@operator"
   },
   LspKindPackage = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindProperty = {
     link = "@property"
   },
   LspKindReference = {
-    link = "@text.reference"
+    link = "@markup.link"
   },
   LspKindSnippet = {
     link = "Conceal"
@@ -1255,7 +1411,7 @@ local highlights = {
     link = "@lsp.type.struct"
   },
   LspKindText = {
-    link = "@text"
+    link = "@markup"
   },
   LspKindTypeParameter = {
     link = "@lsp.type.typeParameter"
@@ -2146,7 +2302,7 @@ local highlights = {
   },
   TroubleNormal = {
     bg = "#e9e9ec",
-    fg = "#6172b0"
+    fg = "#3760bf"
   },
   TroubleText = {
     fg = "#6172b0"
diff --git a/extras/lua/tokyonight_moon.lua b/extras/lua/tokyonight_moon.lua
index 04c07f2..f396e7a 100644
--- a/extras/lua/tokyonight_moon.lua
+++ b/extras/lua/tokyonight_moon.lua
@@ -64,19 +64,86 @@ local colors = {
   red1 = "#c53b53",
   teal = "#4fd6be",
   terminal_black = "#444a73",
+  todo = "#82aaff",
   warning = "#ffc777",
   yellow = "#ffc777"
 }
 
 local highlights = {
+  ["@annotation"] = {
+    link = "PreProc"
+  },
+  ["@attribute"] = {
+    link = "PreProc"
+  },
+  ["@boolean"] = {
+    link = "Boolean"
+  },
+  ["@character"] = {
+    link = "Character"
+  },
+  ["@character.special"] = {
+    link = "SpecialChar"
+  },
+  ["@comment"] = {
+    link = "Comment"
+  },
+  ["@comment.error"] = {
+    fg = "#c53b53"
+  },
+  ["@comment.hint"] = {
+    fg = "#4fd6be"
+  },
+  ["@comment.info"] = {
+    fg = "#0db9d7"
+  },
+  ["@comment.todo"] = {
+    fg = "#82aaff"
+  },
+  ["@comment.warning"] = {
+    fg = "#ffc777"
+  },
+  ["@constant"] = {
+    link = "Constant"
+  },
+  ["@constant.builtin"] = {
+    link = "Special"
+  },
+  ["@constant.macro"] = {
+    link = "Define"
+  },
   ["@constructor"] = {
     fg = "#c099ff"
   },
   ["@constructor.tsx"] = {
     fg = "#65bcff"
   },
-  ["@field"] = {
-    fg = "#4fd6be"
+  ["@diff.delta"] = {
+    link = "DiffChange"
+  },
+  ["@diff.minus"] = {
+    link = "DiffDelete"
+  },
+  ["@diff.plus"] = {
+    link = "DiffAdd"
+  },
+  ["@function"] = {
+    link = "Function"
+  },
+  ["@function.builtin"] = {
+    link = "Special"
+  },
+  ["@function.call"] = {
+    link = "@function"
+  },
+  ["@function.macro"] = {
+    link = "Macro"
+  },
+  ["@function.method"] = {
+    link = "Function"
+  },
+  ["@function.method.call"] = {
+    link = "@function.method"
   },
   ["@keyword"] = {
     fg = "#fca7ea",
@@ -84,10 +151,43 @@ local highlights = {
       italic = true
     }
   },
+  ["@keyword.conditional"] = {
+    link = "Conditional"
+  },
+  ["@keyword.coroutine"] = {
+    link = "@keyword"
+  },
+  ["@keyword.debug"] = {
+    link = "Debug"
+  },
+  ["@keyword.directive"] = {
+    link = "PreProc"
+  },
+  ["@keyword.directive.define"] = {
+    link = "Define"
+  },
+  ["@keyword.exception"] = {
+    link = "Exception"
+  },
   ["@keyword.function"] = {
     fg = "#c099ff",
     style = {}
   },
+  ["@keyword.import"] = {
+    link = "Include"
+  },
+  ["@keyword.operator"] = {
+    link = "@operator"
+  },
+  ["@keyword.repeat"] = {
+    link = "Repeat"
+  },
+  ["@keyword.return"] = {
+    link = "@keyword"
+  },
+  ["@keyword.storage"] = {
+    link = "StorageClass"
+  },
   ["@label"] = {
     fg = "#82aaff"
   },
@@ -116,7 +216,7 @@ local highlights = {
     link = "@string.escape"
   },
   ["@lsp.type.formatSpecifier"] = {
-    link = "@punctuation.special"
+    link = "@markup.list"
   },
   ["@lsp.type.generic"] = {
     link = "@variable"
@@ -128,10 +228,10 @@ local highlights = {
     link = "@keyword"
   },
   ["@lsp.type.lifetime"] = {
-    link = "@storageclass"
+    link = "@keyword.storage"
   },
   ["@lsp.type.namespace"] = {
-    link = "@namespace"
+    link = "@module"
   },
   ["@lsp.type.number"] = {
     link = "@number"
@@ -140,7 +240,7 @@ local highlights = {
     link = "@operator"
   },
   ["@lsp.type.parameter"] = {
-    link = "@parameter"
+    link = "@variable.parameter"
   },
   ["@lsp.type.property"] = {
     link = "@property"
@@ -213,21 +313,105 @@ local highlights = {
   ["@lsp.typemod.variable.static"] = {
     link = "@constant"
   },
-  ["@namespace"] = {
+  ["@markup"] = {
+    link = "@none"
+  },
+  ["@markup.emphasis"] = {
+    italic = true
+  },
+  ["@markup.environment"] = {
+    link = "Macro"
+  },
+  ["@markup.environment.name"] = {
+    link = "Type"
+  },
+  ["@markup.heading"] = {
+    link = "Title"
+  },
+  ["@markup.heading.1.markdown"] = {
+    bold = true,
+    fg = "#82aaff"
+  },
+  ["@markup.heading.2.markdown"] = {
+    bold = true,
+    fg = "#ffc777"
+  },
+  ["@markup.heading.3.markdown"] = {
+    bold = true,
+    fg = "#c3e88d"
+  },
+  ["@markup.heading.4.markdown"] = {
+    bold = true,
+    fg = "#4fd6be"
+  },
+  ["@markup.heading.5.markdown"] = {
+    bold = true,
+    fg = "#c099ff"
+  },
+  ["@markup.heading.6.markdown"] = {
+    bold = true,
+    fg = "#fca7ea"
+  },
+  ["@markup.link"] = {
+    fg = "#4fd6be"
+  },
+  ["@markup.link.label"] = {
+    link = "SpecialChar"
+  },
+  ["@markup.link.label.symbol"] = {
+    link = "Identifier"
+  },
+  ["@markup.link.url"] = {
+    link = "Underlined"
+  },
+  ["@markup.list"] = {
+    fg = "#89ddff"
+  },
+  ["@markup.list.checked"] = {
+    fg = "#4fd6be"
+  },
+  ["@markup.list.markdown"] = {
+    bold = true,
+    fg = "#ff966c"
+  },
+  ["@markup.list.unchecked"] = {
+    fg = "#82aaff"
+  },
+  ["@markup.math"] = {
+    link = "Special"
+  },
+  ["@markup.raw"] = {
+    link = "String"
+  },
+  ["@markup.raw.markdown_inline"] = {
+    bg = "#444a73",
+    fg = "#82aaff"
+  },
+  ["@markup.strikethrough"] = {
+    strikethrough = true
+  },
+  ["@markup.strong"] = {
+    bold = true
+  },
+  ["@markup.underline"] = {
+    underline = true
+  },
+  ["@module"] = {
     link = "Include"
   },
-  ["@namespace.builtin"] = {
+  ["@module.builtin"] = {
     fg = "#ff757f"
   },
+  ["@none"] = {},
+  ["@number"] = {
+    link = "Number"
+  },
+  ["@number.float"] = {
+    link = "Float"
+  },
   ["@operator"] = {
     fg = "#89ddff"
   },
-  ["@parameter"] = {
-    fg = "#ffc777"
-  },
-  ["@parameter.builtin"] = {
-    fg = "#ffd292"
-  },
   ["@property"] = {
     fg = "#4fd6be"
   },
@@ -237,12 +421,8 @@ local highlights = {
   ["@punctuation.delimiter"] = {
     fg = "#89ddff"
   },
-  ["@punctuation.special"] = {
-    fg = "#89ddff"
-  },
-  ["@punctuation.special.markdown"] = {
-    bold = true,
-    fg = "#ff966c"
+  ["@string"] = {
+    link = "String"
   },
   ["@string.documentation"] = {
     fg = "#ffc777"
@@ -250,69 +430,36 @@ local highlights = {
   ["@string.escape"] = {
     fg = "#c099ff"
   },
-  ["@string.regex"] = {
+  ["@string.regexp"] = {
     fg = "#b4f9f8"
   },
+  ["@tag"] = {
+    link = "Label"
+  },
+  ["@tag.attribute"] = {
+    link = "@property"
+  },
+  ["@tag.delimiter"] = {
+    link = "Delimiter"
+  },
   ["@tag.delimiter.tsx"] = {
     fg = "#6582c3"
   },
   ["@tag.tsx"] = {
     fg = "#ff757f"
   },
-  ["@text.danger"] = {
-    bg = "#c53b53",
-    fg = "#222436"
-  },
-  ["@text.diff.add"] = {
-    link = "DiffAdd"
-  },
-  ["@text.diff.delete"] = {
-    link = "DiffDelete"
-  },
-  ["@text.literal.markdown_inline"] = {
-    bg = "#444a73",
-    fg = "#82aaff"
-  },
-  ["@text.reference"] = {
-    fg = "#4fd6be"
-  },
-  ["@text.title.1.markdown"] = {
-    bold = true,
-    fg = "#82aaff"
-  },
-  ["@text.title.2.markdown"] = {
-    bold = true,
-    fg = "#ffc777"
-  },
-  ["@text.title.3.markdown"] = {
-    bold = true,
-    fg = "#c3e88d"
-  },
-  ["@text.title.4.markdown"] = {
-    bold = true,
-    fg = "#4fd6be"
-  },
-  ["@text.title.5.markdown"] = {
-    bold = true,
-    fg = "#c099ff"
-  },
-  ["@text.title.6.markdown"] = {
-    bold = true,
-    fg = "#fca7ea"
-  },
-  ["@text.todo.checked"] = {
-    fg = "#4fd6be"
-  },
-  ["@text.todo.unchecked"] = {
-    fg = "#82aaff"
-  },
-  ["@text.warning"] = {
-    bg = "#ffc777",
-    fg = "#222436"
+  ["@type"] = {
+    link = "Type"
   },
   ["@type.builtin"] = {
     fg = "#589ed7"
   },
+  ["@type.definition"] = {
+    link = "Typedef"
+  },
+  ["@type.qualifier"] = {
+    link = "@keyword"
+  },
   ["@variable"] = {
     fg = "#c8d3f5",
     style = {}
@@ -320,6 +467,15 @@ local highlights = {
   ["@variable.builtin"] = {
     fg = "#ff757f"
   },
+  ["@variable.member"] = {
+    fg = "#4fd6be"
+  },
+  ["@variable.parameter"] = {
+    fg = "#ffc777"
+  },
+  ["@variable.parameter.builtin"] = {
+    fg = "#ffd292"
+  },
   ALEErrorSign = {
     fg = "#c53b53"
   },
@@ -1195,7 +1351,7 @@ local highlights = {
     link = "Special"
   },
   LspKindField = {
-    link = "@field"
+    link = "@variable.member"
   },
   LspKindFile = {
     link = "Normal"
@@ -1210,19 +1366,19 @@ local highlights = {
     link = "@lsp.type.interface"
   },
   LspKindKey = {
-    link = "@field"
+    link = "@variable.member"
   },
   LspKindKeyword = {
     link = "@lsp.type.keyword"
   },
   LspKindMethod = {
-    link = "@method"
+    link = "@function.method"
   },
   LspKindModule = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindNamespace = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindNull = {
     link = "@constant.builtin"
@@ -1237,13 +1393,13 @@ local highlights = {
     link = "@operator"
   },
   LspKindPackage = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindProperty = {
     link = "@property"
   },
   LspKindReference = {
-    link = "@text.reference"
+    link = "@markup.link"
   },
   LspKindSnippet = {
     link = "Conceal"
@@ -1255,7 +1411,7 @@ local highlights = {
     link = "@lsp.type.struct"
   },
   LspKindText = {
-    link = "@text"
+    link = "@markup"
   },
   LspKindTypeParameter = {
     link = "@lsp.type.typeParameter"
@@ -2146,7 +2302,7 @@ local highlights = {
   },
   TroubleNormal = {
     bg = "#1e2030",
-    fg = "#828bb8"
+    fg = "#c8d3f5"
   },
   TroubleText = {
     fg = "#828bb8"
diff --git a/extras/lua/tokyonight_night.lua b/extras/lua/tokyonight_night.lua
index 0062f40..419326e 100644
--- a/extras/lua/tokyonight_night.lua
+++ b/extras/lua/tokyonight_night.lua
@@ -64,19 +64,86 @@ local colors = {
   red1 = "#db4b4b",
   teal = "#1abc9c",
   terminal_black = "#414868",
+  todo = "#7aa2f7",
   warning = "#e0af68",
   yellow = "#e0af68"
 }
 
 local highlights = {
+  ["@annotation"] = {
+    link = "PreProc"
+  },
+  ["@attribute"] = {
+    link = "PreProc"
+  },
+  ["@boolean"] = {
+    link = "Boolean"
+  },
+  ["@character"] = {
+    link = "Character"
+  },
+  ["@character.special"] = {
+    link = "SpecialChar"
+  },
+  ["@comment"] = {
+    link = "Comment"
+  },
+  ["@comment.error"] = {
+    fg = "#db4b4b"
+  },
+  ["@comment.hint"] = {
+    fg = "#1abc9c"
+  },
+  ["@comment.info"] = {
+    fg = "#0db9d7"
+  },
+  ["@comment.todo"] = {
+    fg = "#7aa2f7"
+  },
+  ["@comment.warning"] = {
+    fg = "#e0af68"
+  },
+  ["@constant"] = {
+    link = "Constant"
+  },
+  ["@constant.builtin"] = {
+    link = "Special"
+  },
+  ["@constant.macro"] = {
+    link = "Define"
+  },
   ["@constructor"] = {
     fg = "#bb9af7"
   },
   ["@constructor.tsx"] = {
     fg = "#2ac3de"
   },
-  ["@field"] = {
-    fg = "#73daca"
+  ["@diff.delta"] = {
+    link = "DiffChange"
+  },
+  ["@diff.minus"] = {
+    link = "DiffDelete"
+  },
+  ["@diff.plus"] = {
+    link = "DiffAdd"
+  },
+  ["@function"] = {
+    link = "Function"
+  },
+  ["@function.builtin"] = {
+    link = "Special"
+  },
+  ["@function.call"] = {
+    link = "@function"
+  },
+  ["@function.macro"] = {
+    link = "Macro"
+  },
+  ["@function.method"] = {
+    link = "Function"
+  },
+  ["@function.method.call"] = {
+    link = "@function.method"
   },
   ["@keyword"] = {
     fg = "#9d7cd8",
@@ -84,10 +151,43 @@ local highlights = {
       italic = true
     }
   },
+  ["@keyword.conditional"] = {
+    link = "Conditional"
+  },
+  ["@keyword.coroutine"] = {
+    link = "@keyword"
+  },
+  ["@keyword.debug"] = {
+    link = "Debug"
+  },
+  ["@keyword.directive"] = {
+    link = "PreProc"
+  },
+  ["@keyword.directive.define"] = {
+    link = "Define"
+  },
+  ["@keyword.exception"] = {
+    link = "Exception"
+  },
   ["@keyword.function"] = {
     fg = "#bb9af7",
     style = {}
   },
+  ["@keyword.import"] = {
+    link = "Include"
+  },
+  ["@keyword.operator"] = {
+    link = "@operator"
+  },
+  ["@keyword.repeat"] = {
+    link = "Repeat"
+  },
+  ["@keyword.return"] = {
+    link = "@keyword"
+  },
+  ["@keyword.storage"] = {
+    link = "StorageClass"
+  },
   ["@label"] = {
     fg = "#7aa2f7"
   },
@@ -116,7 +216,7 @@ local highlights = {
     link = "@string.escape"
   },
   ["@lsp.type.formatSpecifier"] = {
-    link = "@punctuation.special"
+    link = "@markup.list"
   },
   ["@lsp.type.generic"] = {
     link = "@variable"
@@ -128,10 +228,10 @@ local highlights = {
     link = "@keyword"
   },
   ["@lsp.type.lifetime"] = {
-    link = "@storageclass"
+    link = "@keyword.storage"
   },
   ["@lsp.type.namespace"] = {
-    link = "@namespace"
+    link = "@module"
   },
   ["@lsp.type.number"] = {
     link = "@number"
@@ -140,7 +240,7 @@ local highlights = {
     link = "@operator"
   },
   ["@lsp.type.parameter"] = {
-    link = "@parameter"
+    link = "@variable.parameter"
   },
   ["@lsp.type.property"] = {
     link = "@property"
@@ -213,21 +313,105 @@ local highlights = {
   ["@lsp.typemod.variable.static"] = {
     link = "@constant"
   },
-  ["@namespace"] = {
+  ["@markup"] = {
+    link = "@none"
+  },
+  ["@markup.emphasis"] = {
+    italic = true
+  },
+  ["@markup.environment"] = {
+    link = "Macro"
+  },
+  ["@markup.environment.name"] = {
+    link = "Type"
+  },
+  ["@markup.heading"] = {
+    link = "Title"
+  },
+  ["@markup.heading.1.markdown"] = {
+    bold = true,
+    fg = "#7aa2f7"
+  },
+  ["@markup.heading.2.markdown"] = {
+    bold = true,
+    fg = "#e0af68"
+  },
+  ["@markup.heading.3.markdown"] = {
+    bold = true,
+    fg = "#9ece6a"
+  },
+  ["@markup.heading.4.markdown"] = {
+    bold = true,
+    fg = "#1abc9c"
+  },
+  ["@markup.heading.5.markdown"] = {
+    bold = true,
+    fg = "#bb9af7"
+  },
+  ["@markup.heading.6.markdown"] = {
+    bold = true,
+    fg = "#9d7cd8"
+  },
+  ["@markup.link"] = {
+    fg = "#1abc9c"
+  },
+  ["@markup.link.label"] = {
+    link = "SpecialChar"
+  },
+  ["@markup.link.label.symbol"] = {
+    link = "Identifier"
+  },
+  ["@markup.link.url"] = {
+    link = "Underlined"
+  },
+  ["@markup.list"] = {
+    fg = "#89ddff"
+  },
+  ["@markup.list.checked"] = {
+    fg = "#73daca"
+  },
+  ["@markup.list.markdown"] = {
+    bold = true,
+    fg = "#ff9e64"
+  },
+  ["@markup.list.unchecked"] = {
+    fg = "#7aa2f7"
+  },
+  ["@markup.math"] = {
+    link = "Special"
+  },
+  ["@markup.raw"] = {
+    link = "String"
+  },
+  ["@markup.raw.markdown_inline"] = {
+    bg = "#414868",
+    fg = "#7aa2f7"
+  },
+  ["@markup.strikethrough"] = {
+    strikethrough = true
+  },
+  ["@markup.strong"] = {
+    bold = true
+  },
+  ["@markup.underline"] = {
+    underline = true
+  },
+  ["@module"] = {
     link = "Include"
   },
-  ["@namespace.builtin"] = {
+  ["@module.builtin"] = {
     fg = "#f7768e"
   },
+  ["@none"] = {},
+  ["@number"] = {
+    link = "Number"
+  },
+  ["@number.float"] = {
+    link = "Float"
+  },
   ["@operator"] = {
     fg = "#89ddff"
   },
-  ["@parameter"] = {
-    fg = "#e0af68"
-  },
-  ["@parameter.builtin"] = {
-    fg = "#e6bf86"
-  },
   ["@property"] = {
     fg = "#73daca"
   },
@@ -237,12 +421,8 @@ local highlights = {
   ["@punctuation.delimiter"] = {
     fg = "#89ddff"
   },
-  ["@punctuation.special"] = {
-    fg = "#89ddff"
-  },
-  ["@punctuation.special.markdown"] = {
-    bold = true,
-    fg = "#ff9e64"
+  ["@string"] = {
+    link = "String"
   },
   ["@string.documentation"] = {
     fg = "#e0af68"
@@ -250,69 +430,36 @@ local highlights = {
   ["@string.escape"] = {
     fg = "#bb9af7"
   },
-  ["@string.regex"] = {
+  ["@string.regexp"] = {
     fg = "#b4f9f8"
   },
+  ["@tag"] = {
+    link = "Label"
+  },
+  ["@tag.attribute"] = {
+    link = "@property"
+  },
+  ["@tag.delimiter"] = {
+    link = "Delimiter"
+  },
   ["@tag.delimiter.tsx"] = {
     fg = "#5d7ab8"
   },
   ["@tag.tsx"] = {
     fg = "#f7768e"
   },
-  ["@text.danger"] = {
-    bg = "#db4b4b",
-    fg = "#1a1b26"
-  },
-  ["@text.diff.add"] = {
-    link = "DiffAdd"
-  },
-  ["@text.diff.delete"] = {
-    link = "DiffDelete"
-  },
-  ["@text.literal.markdown_inline"] = {
-    bg = "#414868",
-    fg = "#7aa2f7"
-  },
-  ["@text.reference"] = {
-    fg = "#1abc9c"
-  },
-  ["@text.title.1.markdown"] = {
-    bold = true,
-    fg = "#7aa2f7"
-  },
-  ["@text.title.2.markdown"] = {
-    bold = true,
-    fg = "#e0af68"
-  },
-  ["@text.title.3.markdown"] = {
-    bold = true,
-    fg = "#9ece6a"
-  },
-  ["@text.title.4.markdown"] = {
-    bold = true,
-    fg = "#1abc9c"
-  },
-  ["@text.title.5.markdown"] = {
-    bold = true,
-    fg = "#bb9af7"
-  },
-  ["@text.title.6.markdown"] = {
-    bold = true,
-    fg = "#9d7cd8"
-  },
-  ["@text.todo.checked"] = {
-    fg = "#73daca"
-  },
-  ["@text.todo.unchecked"] = {
-    fg = "#7aa2f7"
-  },
-  ["@text.warning"] = {
-    bg = "#e0af68",
-    fg = "#1a1b26"
+  ["@type"] = {
+    link = "Type"
   },
   ["@type.builtin"] = {
     fg = "#27a1b9"
   },
+  ["@type.definition"] = {
+    link = "Typedef"
+  },
+  ["@type.qualifier"] = {
+    link = "@keyword"
+  },
   ["@variable"] = {
     fg = "#c0caf5",
     style = {}
@@ -320,6 +467,15 @@ local highlights = {
   ["@variable.builtin"] = {
     fg = "#f7768e"
   },
+  ["@variable.member"] = {
+    fg = "#73daca"
+  },
+  ["@variable.parameter"] = {
+    fg = "#e0af68"
+  },
+  ["@variable.parameter.builtin"] = {
+    fg = "#e6bf86"
+  },
   ALEErrorSign = {
     fg = "#db4b4b"
   },
@@ -1195,7 +1351,7 @@ local highlights = {
     link = "Special"
   },
   LspKindField = {
-    link = "@field"
+    link = "@variable.member"
   },
   LspKindFile = {
     link = "Normal"
@@ -1210,19 +1366,19 @@ local highlights = {
     link = "@lsp.type.interface"
   },
   LspKindKey = {
-    link = "@field"
+    link = "@variable.member"
   },
   LspKindKeyword = {
     link = "@lsp.type.keyword"
   },
   LspKindMethod = {
-    link = "@method"
+    link = "@function.method"
   },
   LspKindModule = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindNamespace = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindNull = {
     link = "@constant.builtin"
@@ -1237,13 +1393,13 @@ local highlights = {
     link = "@operator"
   },
   LspKindPackage = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindProperty = {
     link = "@property"
   },
   LspKindReference = {
-    link = "@text.reference"
+    link = "@markup.link"
   },
   LspKindSnippet = {
     link = "Conceal"
@@ -1255,7 +1411,7 @@ local highlights = {
     link = "@lsp.type.struct"
   },
   LspKindText = {
-    link = "@text"
+    link = "@markup"
   },
   LspKindTypeParameter = {
     link = "@lsp.type.typeParameter"
@@ -2146,7 +2302,7 @@ local highlights = {
   },
   TroubleNormal = {
     bg = "#16161e",
-    fg = "#a9b1d6"
+    fg = "#c0caf5"
   },
   TroubleText = {
     fg = "#a9b1d6"
diff --git a/extras/lua/tokyonight_storm.lua b/extras/lua/tokyonight_storm.lua
index 257a178..a74169b 100644
--- a/extras/lua/tokyonight_storm.lua
+++ b/extras/lua/tokyonight_storm.lua
@@ -64,19 +64,86 @@ local colors = {
   red1 = "#db4b4b",
   teal = "#1abc9c",
   terminal_black = "#414868",
+  todo = "#7aa2f7",
   warning = "#e0af68",
   yellow = "#e0af68"
 }
 
 local highlights = {
+  ["@annotation"] = {
+    link = "PreProc"
+  },
+  ["@attribute"] = {
+    link = "PreProc"
+  },
+  ["@boolean"] = {
+    link = "Boolean"
+  },
+  ["@character"] = {
+    link = "Character"
+  },
+  ["@character.special"] = {
+    link = "SpecialChar"
+  },
+  ["@comment"] = {
+    link = "Comment"
+  },
+  ["@comment.error"] = {
+    fg = "#db4b4b"
+  },
+  ["@comment.hint"] = {
+    fg = "#1abc9c"
+  },
+  ["@comment.info"] = {
+    fg = "#0db9d7"
+  },
+  ["@comment.todo"] = {
+    fg = "#7aa2f7"
+  },
+  ["@comment.warning"] = {
+    fg = "#e0af68"
+  },
+  ["@constant"] = {
+    link = "Constant"
+  },
+  ["@constant.builtin"] = {
+    link = "Special"
+  },
+  ["@constant.macro"] = {
+    link = "Define"
+  },
   ["@constructor"] = {
     fg = "#bb9af7"
   },
   ["@constructor.tsx"] = {
     fg = "#2ac3de"
   },
-  ["@field"] = {
-    fg = "#73daca"
+  ["@diff.delta"] = {
+    link = "DiffChange"
+  },
+  ["@diff.minus"] = {
+    link = "DiffDelete"
+  },
+  ["@diff.plus"] = {
+    link = "DiffAdd"
+  },
+  ["@function"] = {
+    link = "Function"
+  },
+  ["@function.builtin"] = {
+    link = "Special"
+  },
+  ["@function.call"] = {
+    link = "@function"
+  },
+  ["@function.macro"] = {
+    link = "Macro"
+  },
+  ["@function.method"] = {
+    link = "Function"
+  },
+  ["@function.method.call"] = {
+    link = "@function.method"
   },
   ["@keyword"] = {
     fg = "#9d7cd8",
@@ -84,10 +151,43 @@ local highlights = {
       italic = true
     }
   },
+  ["@keyword.conditional"] = {
+    link = "Conditional"
+  },
+  ["@keyword.coroutine"] = {
+    link = "@keyword"
+  },
+  ["@keyword.debug"] = {
+    link = "Debug"
+  },
+  ["@keyword.directive"] = {
+    link = "PreProc"
+  },
+  ["@keyword.directive.define"] = {
+    link = "Define"
+  },
+  ["@keyword.exception"] = {
+    link = "Exception"
+  },
   ["@keyword.function"] = {
     fg = "#bb9af7",
     style = {}
   },
+  ["@keyword.import"] = {
+    link = "Include"
+  },
+  ["@keyword.operator"] = {
+    link = "@operator"
+  },
+  ["@keyword.repeat"] = {
+    link = "Repeat"
+  },
+  ["@keyword.return"] = {
+    link = "@keyword"
+  },
+  ["@keyword.storage"] = {
+    link = "StorageClass"
+  },
   ["@label"] = {
     fg = "#7aa2f7"
   },
@@ -116,7 +216,7 @@ local highlights = {
     link = "@string.escape"
   },
   ["@lsp.type.formatSpecifier"] = {
-    link = "@punctuation.special"
+    link = "@markup.list"
   },
   ["@lsp.type.generic"] = {
     link = "@variable"
@@ -128,10 +228,10 @@ local highlights = {
     link = "@keyword"
   },
   ["@lsp.type.lifetime"] = {
-    link = "@storageclass"
+    link = "@keyword.storage"
   },
   ["@lsp.type.namespace"] = {
-    link = "@namespace"
+    link = "@module"
   },
   ["@lsp.type.number"] = {
     link = "@number"
@@ -140,7 +240,7 @@ local highlights = {
     link = "@operator"
   },
   ["@lsp.type.parameter"] = {
-    link = "@parameter"
+    link = "@variable.parameter"
   },
   ["@lsp.type.property"] = {
     link = "@property"
@@ -213,21 +313,105 @@ local highlights = {
   ["@lsp.typemod.variable.static"] = {
     link = "@constant"
   },
-  ["@namespace"] = {
+  ["@markup"] = {
+    link = "@none"
+  },
+  ["@markup.emphasis"] = {
+    italic = true
+  },
+  ["@markup.environment"] = {
+    link = "Macro"
+  },
+  ["@markup.environment.name"] = {
+    link = "Type"
+  },
+  ["@markup.heading"] = {
+    link = "Title"
+  },
+  ["@markup.heading.1.markdown"] = {
+    bold = true,
+    fg = "#7aa2f7"
+  },
+  ["@markup.heading.2.markdown"] = {
+    bold = true,
+    fg = "#e0af68"
+  },
+  ["@markup.heading.3.markdown"] = {
+    bold = true,
+    fg = "#9ece6a"
+  },
+  ["@markup.heading.4.markdown"] = {
+    bold = true,
+    fg = "#1abc9c"
+  },
+  ["@markup.heading.5.markdown"] = {
+    bold = true,
+    fg = "#bb9af7"
+  },
+  ["@markup.heading.6.markdown"] = {
+    bold = true,
+    fg = "#9d7cd8"
+  },
+  ["@markup.link"] = {
+    fg = "#1abc9c"
+  },
+  ["@markup.link.label"] = {
+    link = "SpecialChar"
+  },
+  ["@markup.link.label.symbol"] = {
+    link = "Identifier"
+  },
+  ["@markup.link.url"] = {
+    link = "Underlined"
+  },
+  ["@markup.list"] = {
+    fg = "#89ddff"
+  },
+  ["@markup.list.checked"] = {
+    fg = "#73daca"
+  },
+  ["@markup.list.markdown"] = {
+    bold = true,
+    fg = "#ff9e64"
+  },
+  ["@markup.list.unchecked"] = {
+    fg = "#7aa2f7"
+  },
+  ["@markup.math"] = {
+    link = "Special"
+  },
+  ["@markup.raw"] = {
+    link = "String"
+  },
+  ["@markup.raw.markdown_inline"] = {
+    bg = "#414868",
+    fg = "#7aa2f7"
+  },
+  ["@markup.strikethrough"] = {
+    strikethrough = true
+  },
+  ["@markup.strong"] = {
+    bold = true
+  },
+  ["@markup.underline"] = {
+    underline = true
+  },
+  ["@module"] = {
     link = "Include"
   },
-  ["@namespace.builtin"] = {
+  ["@module.builtin"] = {
     fg = "#f7768e"
   },
+  ["@none"] = {},
+  ["@number"] = {
+    link = "Number"
+  },
+  ["@number.float"] = {
+    link = "Float"
+  },
   ["@operator"] = {
     fg = "#89ddff"
   },
-  ["@parameter"] = {
-    fg = "#e0af68"
-  },
-  ["@parameter.builtin"] = {
-    fg = "#e6bf86"
-  },
   ["@property"] = {
     fg = "#73daca"
   },
@@ -237,12 +421,8 @@ local highlights = {
   ["@punctuation.delimiter"] = {
     fg = "#89ddff"
   },
-  ["@punctuation.special"] = {
-    fg = "#89ddff"
-  },
-  ["@punctuation.special.markdown"] = {
-    bold = true,
-    fg = "#ff9e64"
+  ["@string"] = {
+    link = "String"
   },
   ["@string.documentation"] = {
     fg = "#e0af68"
@@ -250,69 +430,36 @@ local highlights = {
   ["@string.escape"] = {
     fg = "#bb9af7"
   },
-  ["@string.regex"] = {
+  ["@string.regexp"] = {
     fg = "#b4f9f8"
   },
+  ["@tag"] = {
+    link = "Label"
+  },
+  ["@tag.attribute"] = {
+    link = "@property"
+  },
+  ["@tag.delimiter"] = {
+    link = "Delimiter"
+  },
   ["@tag.delimiter.tsx"] = {
     fg = "#607dbf"
   },
   ["@tag.tsx"] = {
     fg = "#f7768e"
   },
-  ["@text.danger"] = {
-    bg = "#db4b4b",
-    fg = "#24283b"
-  },
-  ["@text.diff.add"] = {
-    link = "DiffAdd"
-  },
-  ["@text.diff.delete"] = {
-    link = "DiffDelete"
-  },
-  ["@text.literal.markdown_inline"] = {
-    bg = "#414868",
-    fg = "#7aa2f7"
-  },
-  ["@text.reference"] = {
-    fg = "#1abc9c"
-  },
-  ["@text.title.1.markdown"] = {
-    bold = true,
-    fg = "#7aa2f7"
-  },
-  ["@text.title.2.markdown"] = {
-    bold = true,
-    fg = "#e0af68"
-  },
-  ["@text.title.3.markdown"] = {
-    bold = true,
-    fg = "#9ece6a"
-  },
-  ["@text.title.4.markdown"] = {
-    bold = true,
-    fg = "#1abc9c"
-  },
-  ["@text.title.5.markdown"] = {
-    bold = true,
-    fg = "#bb9af7"
-  },
-  ["@text.title.6.markdown"] = {
-    bold = true,
-    fg = "#9d7cd8"
-  },
-  ["@text.todo.checked"] = {
-    fg = "#73daca"
-  },
-  ["@text.todo.unchecked"] = {
-    fg = "#7aa2f7"
-  },
-  ["@text.warning"] = {
-    bg = "#e0af68",
-    fg = "#24283b"
+  ["@type"] = {
+    link = "Type"
   },
   ["@type.builtin"] = {
     fg = "#29a4bd"
   },
+  ["@type.definition"] = {
+    link = "Typedef"
+  },
+  ["@type.qualifier"] = {
+    link = "@keyword"
+  },
   ["@variable"] = {
     fg = "#c0caf5",
     style = {}
@@ -320,6 +467,15 @@ local highlights = {
   ["@variable.builtin"] = {
     fg = "#f7768e"
   },
+  ["@variable.member"] = {
+    fg = "#73daca"
+  },
+  ["@variable.parameter"] = {
+    fg = "#e0af68"
+  },
+  ["@variable.parameter.builtin"] = {
+    fg = "#e6bf86"
+  },
   ALEErrorSign = {
     fg = "#db4b4b"
   },
@@ -1195,7 +1351,7 @@ local highlights = {
     link = "Special"
   },
   LspKindField = {
-    link = "@field"
+    link = "@variable.member"
   },
   LspKindFile = {
     link = "Normal"
@@ -1210,19 +1366,19 @@ local highlights = {
     link = "@lsp.type.interface"
   },
   LspKindKey = {
-    link = "@field"
+    link = "@variable.member"
   },
   LspKindKeyword = {
     link = "@lsp.type.keyword"
   },
   LspKindMethod = {
-    link = "@method"
+    link = "@function.method"
   },
   LspKindModule = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindNamespace = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindNull = {
     link = "@constant.builtin"
@@ -1237,13 +1393,13 @@ local highlights = {
     link = "@operator"
   },
   LspKindPackage = {
-    link = "@namespace"
+    link = "@module"
   },
   LspKindProperty = {
     link = "@property"
   },
   LspKindReference = {
-    link = "@text.reference"
+    link = "@markup.link"
   },
   LspKindSnippet = {
     link = "Conceal"
@@ -1255,7 +1411,7 @@ local highlights = {
     link = "@lsp.type.struct"
   },
   LspKindText = {
-    link = "@text"
+    link = "@markup"
   },
   LspKindTypeParameter = {
     link = "@lsp.type.typeParameter"
@@ -2146,7 +2302,7 @@ local highlights = {
   },
   TroubleNormal = {
     bg = "#1f2335",
-    fg = "#a9b1d6"
+    fg = "#c0caf5"
   },
   TroubleText = {
     fg = "#a9b1d6"