diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json
index 745eb2b4c27332..dd5bfa46c0e5ef 100644
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -236,6 +236,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#bfbdb6ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#628b80ff",
             "font_style": null,
@@ -251,6 +256,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#fe8f40ff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#fe8f40ff",
             "font_style": "italic",
@@ -306,7 +316,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#a6a5a0ff",
             "font_style": null,
             "font_weight": null
@@ -316,6 +326,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#fe8f40ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#5ac1feff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#a9d94bff",
             "font_style": null,
@@ -607,6 +627,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#5c6166ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#8ca7c2ff",
             "font_style": null,
@@ -622,6 +647,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#f98d3fff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#f98d3fff",
             "font_style": "italic",
@@ -677,7 +707,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#73777bff",
             "font_style": null,
             "font_weight": null
@@ -687,6 +717,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#f98d3fff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#3b9ee5ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#86b300ff",
             "font_style": null,
@@ -978,6 +1018,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#cccac2ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#7399a3ff",
             "font_style": null,
@@ -993,6 +1038,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#fead66ff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#fead66ff",
             "font_style": "italic",
@@ -1048,7 +1098,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#b4b3aeff",
             "font_style": null,
             "font_weight": null
@@ -1058,6 +1108,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#fead66ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#72cffeff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#d4fe7fff",
             "font_style": null,
diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json
index 958cf4797dc6f4..b02bd997085bed 100644
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -253,6 +253,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#b8bb25ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#8c957dff",
             "font_style": null,
@@ -268,6 +273,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#8ec07cff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#8ec07cff",
             "font_style": "italic",
@@ -323,8 +333,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
+          "punctuation.markup": {
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -333,6 +343,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -641,6 +661,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#b8bb25ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#8c957dff",
             "font_style": null,
@@ -656,6 +681,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#8ec07cff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#8ec07cff",
             "font_style": "italic",
@@ -711,8 +741,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
+          "punctuation.markup": {
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -721,6 +751,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -1029,6 +1069,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#b8bb25ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#8c957dff",
             "font_style": null,
@@ -1044,6 +1089,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#8ec07cff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#8ec07cff",
             "font_style": "italic",
@@ -1099,8 +1149,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
+          "punctuation.markup": {
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -1109,6 +1159,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -1417,6 +1477,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#79740eff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#677562ff",
             "font_style": null,
@@ -1432,6 +1497,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#427b58ff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#427b58ff",
             "font_style": "italic",
@@ -1487,8 +1557,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
+          "punctuation.markup": {
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },
@@ -1497,6 +1567,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#0b6678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#79740eff",
             "font_style": null,
@@ -1805,6 +1885,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#79740eff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#677562ff",
             "font_style": null,
@@ -1820,6 +1905,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#427b58ff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#427b58ff",
             "font_style": "italic",
@@ -1875,8 +1965,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
+          "punctuation.markup": {
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },
@@ -1885,6 +1975,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#0b6678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#79740eff",
             "font_style": null,
@@ -2193,6 +2293,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#79740eff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#677562ff",
             "font_style": null,
@@ -2208,6 +2313,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#427b58ff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#427b58ff",
             "font_style": "italic",
@@ -2263,8 +2373,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
+          "punctuation.markup": {
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },
@@ -2273,6 +2383,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#0b6678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#79740eff",
             "font_style": null,
diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json
index 9d7a29cd957783..4d5a2f9b78781e 100644
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -239,6 +239,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#d07277ff",
+            "font_style": null,
+            "font_weight": 400
+          },
           "hint": {
             "color": "#788ca6ff",
             "font_style": null,
@@ -254,6 +259,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#73ade9ff",
+            "font_style": "normal",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#73ade9ff",
             "font_style": "normal",
@@ -309,7 +319,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#d07277ff",
             "font_style": null,
             "font_weight": null
@@ -319,6 +329,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#a1c181ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#74ade8ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#a1c181ff",
             "font_style": null,
@@ -618,6 +638,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#d3604fff",
+            "font_style": null,
+            "font_weight": 400
+          },
           "hint": {
             "color": "#7274a7ff",
             "font_style": null,
@@ -633,6 +658,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "link": {
+            "color": "#5b79e3ff",
+            "font_style": "italic",
+            "font_weight": null
+          },
           "link_text": {
             "color": "#5b79e3ff",
             "font_style": "italic",
@@ -688,7 +718,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#d3604fff",
             "font_style": null,
             "font_weight": null
@@ -698,6 +728,16 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#649f57ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#5c78e2ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#649f57ff",
             "font_style": null,
diff --git a/crates/languages/src/gitcommit/highlights.scm b/crates/languages/src/gitcommit/highlights.scm
index 319d76569e56f1..91cf8a9279e00e 100644
--- a/crates/languages/src/gitcommit/highlights.scm
+++ b/crates/languages/src/gitcommit/highlights.scm
@@ -1,8 +1,8 @@
-(subject) @markup.heading
+(subject) @heading.markup
 (path) @string.special.path
 (branch) @string.special.symbol
 (commit) @constant
-(item) @markup.link.url
+(item) @link.uri.markup
 (header) @tag
 
 (change kind: "new file" @diff.plus)
diff --git a/crates/languages/src/markdown-inline/highlights.scm b/crates/languages/src/markdown-inline/highlights.scm
index 61c3e34c62973c..72fc6fc9914ce1 100644
--- a/crates/languages/src/markdown-inline/highlights.scm
+++ b/crates/languages/src/markdown-inline/highlights.scm
@@ -1,6 +1,23 @@
-(emphasis) @emphasis
-(strong_emphasis) @emphasis.strong
-(code_span) @text.literal
-(link_text) @link_text
-(link_label) @link_text
-(link_destination) @link_uri
+(emphasis) @emphasis.markup
+(strong_emphasis) @emphasis.strong.markup
+(code_span) @text.literal.markup ; @raw.markup
+(strikethrough) @strikethrough.markup
+
+[
+  (inline_link)
+  (shortcut_link)
+  (collapsed_reference_link)
+  (full_reference_link)
+  (image)
+] @link.markup
+
+(link_text) @link_text.markup ; @link.markup
+(link_label) @link_text.markup ; @link.label.markup
+
+(inline_link ["(" ")"] @link_uri.markup) ; @link.uri.markup
+(image ["(" ")"] @link_uri.markup) ; @link.uri.markup
+[
+  (link_destination)
+  (uri_autolink)
+  (email_autolink)
+] @link_uri.markup ; @link.uri.markup
diff --git a/crates/languages/src/markdown/highlights.scm b/crates/languages/src/markdown/highlights.scm
index 6b9fa3482298c9..2a45701ac9b7e4 100644
--- a/crates/languages/src/markdown/highlights.scm
+++ b/crates/languages/src/markdown/highlights.scm
@@ -1,7 +1,15 @@
+[
+  (paragraph)
+  (indented_code_block)
+  (pipe_table)
+] @text
+
 [
   (atx_heading)
   (setext_heading)
-] @title
+  (thematic_break)
+] @title.markup ; @heading.markup
+(setext_heading (paragraph) @title.markup) ; @heading.markup
 
 [
   (list_marker_plus)
@@ -9,8 +17,18 @@
   (list_marker_star)
   (list_marker_dot)
   (list_marker_parenthesis)
-] @punctuation.list_marker
+] @punctuation.list_marker.markup ; @punctuation.list.markup
+
+(block_quote_marker) @punctuation.markup
+(pipe_table_header "|" @punctuation.markup)
+(pipe_table_row "|" @punctuation.markup)
+(pipe_table_delimiter_row "|" @punctuation.markup)
+(pipe_table_delimiter_cell "-" @punctuation.markup)
 
 (fenced_code_block
   (info_string
-    (language) @text.literal))
+    (language) @punctuation.embedded.markup))
+(fenced_code_block_delimiter) @punctuation.embedded.markup
+
+(link_reference_definition) @link.markup
+(link_destination) @link_uri.markup ; @link.uri.markup