diff --git a/packages/shiki/languages/astro.tmLanguage.json b/packages/shiki/languages/astro.tmLanguage.json
index 6998556b0..b89c5a3ad 100644
--- a/packages/shiki/languages/astro.tmLanguage.json
+++ b/packages/shiki/languages/astro.tmLanguage.json
@@ -7,9 +7,6 @@
   "name": "astro",
   "scopeName": "source.astro",
   "patterns": [
-    {
-      "include": "#astro:markdown"
-    },
     {
       "include": "#astro:expressions"
     },
@@ -435,7 +432,7 @@
     },
     "html:attribute": {
       "name": "meta.attribute.$1.html",
-      "match": "\\b(@?[a-zA-Z\\-:]+)(=?)",
+      "match": "([a-zA-Z\\-:@_.]+)(=?)",
       "captures": {
         "1": {
           "name": "entity.other.attribute-name.html"
@@ -657,47 +654,6 @@
         }
       ]
     },
-    "astro:markdown": {
-      "begin": "(<)(Markdown)",
-      "end": "(</)(Markdown)\\s*(>)|(/>)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.tag.begin.astro"
-        },
-        "2": {
-          "name": "entity.name.tag.astro support.class.component.astro"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.tag.begin.astro"
-        },
-        "2": {
-          "name": "entity.name.tag.astro support.class.component.astro"
-        },
-        "3": {
-          "name": "punctuation.definition.tag.end.astro"
-        },
-        "4": {
-          "name": "punctuation.definition.tag.end.astro"
-        }
-      },
-      "patterns": [
-        {
-          "begin": "(?<=>)(?!</)",
-          "end": "(?=</)",
-          "contentName": "text.html.markdown",
-          "patterns": [
-            {
-              "include": "text.html.markdown"
-            }
-          ]
-        },
-        {
-          "include": "#html:tag-attributes"
-        }
-      ]
-    },
     "frontmatter": {
       "comment": "The frontmatter is treated as comments in order to get the \"faded\" look",
       "begin": "\\A(-{3})\\s*$",
diff --git a/packages/shiki/languages/bicep.tmLanguage.json b/packages/shiki/languages/bicep.tmLanguage.json
index 173c2ee88..239dcab5b 100644
--- a/packages/shiki/languages/bicep.tmLanguage.json
+++ b/packages/shiki/languages/bicep.tmLanguage.json
@@ -53,6 +53,23 @@
         }
       ]
     },
+    "directive": {
+      "name": "meta.directive.bicep",
+      "begin": "#\\b[_a-zA-Z-0-9]+\\b",
+      "end": "$",
+      "patterns": [
+        {
+          "include": "#directive-variable"
+        },
+        {
+          "include": "#comments"
+        }
+      ]
+    },
+    "directive-variable": {
+      "name": "keyword.control.declaration.bicep",
+      "match": "\\b[_a-zA-Z-0-9]+\\b"
+    },
     "escape-character": {
       "name": "constant.character.escape.bicep",
       "match": "\\\\(u{[0-9A-Fa-f]+}|n|r|t|\\\\|'|\\${)"
@@ -88,6 +105,12 @@
         },
         {
           "include": "#decorator"
+        },
+        {
+          "include": "#lambda-start"
+        },
+        {
+          "include": "#directive"
         }
       ]
     },
@@ -117,6 +140,24 @@
       "name": "keyword.control.declaration.bicep",
       "match": "\\b(targetScope|resource|module|param|var|output|for|in|if|existing|import|from)\\b"
     },
+    "lambda-start": {
+      "name": "meta.lambda-start.bicep",
+      "begin": "(\\((?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*\\b[_$[:alpha:]][_$[:alnum:]]*\\b(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*(,(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*\\b[_$[:alpha:]][_$[:alnum:]]*\\b(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*)*\\)|\\((?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*\\)|(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*\\b[_$[:alpha:]][_$[:alnum:]]*\\b(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*)(?=(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*=>)",
+      "beginCaptures": {
+        "1": {
+          "name": "meta.undefined.bicep",
+          "patterns": [
+            {
+              "include": "#identifier"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        }
+      },
+      "end": "(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*=>"
+    },
     "line-comment": {
       "name": "comment.line.double-slash.bicep",
       "match": "//.*(?=$)"
@@ -135,49 +176,8 @@
       "end": "}",
       "patterns": [
         {
-          "include": "#object-property"
-        },
-        {
-          "include": "#comments"
-        }
-      ]
-    },
-    "object-property": {
-      "name": "meta.object-property.bicep",
-      "begin": "(?<=^)(?!(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*})",
-      "end": "(?=$)",
-      "patterns": [
-        {
-          "include": "#object-property-key-identifier"
-        },
-        {
-          "include": "#string-literal"
-        },
-        {
-          "include": "#object-property-end"
+          "include": "#object-property-key"
         },
-        {
-          "include": "#comments"
-        }
-      ]
-    },
-    "object-property-end": {
-      "name": "meta.object-property-end.bicep",
-      "begin": ":((?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*)",
-      "beginCaptures": {
-        "1": {
-          "patterns": [
-            {
-              "include": "#line-comment"
-            },
-            {
-              "include": "#block-comment"
-            }
-          ]
-        }
-      },
-      "end": "(?=(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*$)",
-      "patterns": [
         {
           "include": "#expression"
         },
@@ -186,14 +186,9 @@
         }
       ]
     },
-    "object-property-key-identifier": {
-      "name": "meta.object-property-key-identifier.bicep",
-      "match": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b)",
-      "captures": {
-        "1": {
-          "name": "variable.other.property.bicep"
-        }
-      }
+    "object-property-key": {
+      "name": "variable.other.property.bicep",
+      "match": "\\b[_$[:alpha:]][_$[:alnum:]]*\\b(?=(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*:)"
     },
     "string-literal": {
       "name": "string.quoted.single.bicep",
diff --git a/packages/shiki/languages/csharp.tmLanguage.json b/packages/shiki/languages/csharp.tmLanguage.json
index 7153d1cdb..839935fff 100644
--- a/packages/shiki/languages/csharp.tmLanguage.json
+++ b/packages/shiki/languages/csharp.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/dotnet/csharp-tmLanguage/commit/16612717ccd557383c0c821d7b6ae6662492ffde",
+  "version": "https://github.com/dotnet/csharp-tmLanguage/commit/5e7dd90d2af9817b0dfb614b21c79a3e81882d9f",
   "name": "csharp",
   "scopeName": "source.cs",
   "patterns": [
@@ -289,6 +289,9 @@
         {
           "include": "#throw-expression"
         },
+        {
+          "include": "#raw-interpolated-string"
+        },
         {
           "include": "#interpolated-string"
         },
@@ -571,7 +574,7 @@
     },
     "storage-modifier": {
       "name": "storage.modifier.cs",
-      "match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref)\\b"
+      "match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required)\\b"
     },
     "class-declaration": {
       "begin": "(?=\\bclass\\b)",
@@ -2780,6 +2783,184 @@
         }
       ]
     },
+    "raw-interpolated-string": {
+      "patterns": [
+        {
+          "include": "#raw-interpolated-string-five-or-more-quote-one-or-more-interpolation"
+        },
+        {
+          "include": "#raw-interpolated-string-three-or-more-quote-three-or-more-interpolation"
+        },
+        {
+          "include": "#raw-interpolated-string-quadruple-quote-double-interpolation"
+        },
+        {
+          "include": "#raw-interpolated-string-quadruple-quote-single-interpolation"
+        },
+        {
+          "include": "#raw-interpolated-string-triple-quote-double-interpolation"
+        },
+        {
+          "include": "#raw-interpolated-string-triple-quote-single-interpolation"
+        }
+      ]
+    },
+    "raw-interpolated-string-triple-quote-single-interpolation": {
+      "name": "string.quoted.double.cs",
+      "begin": "\\$\"\"\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#raw-interpolation"
+        }
+      ]
+    },
+    "raw-interpolated-string-triple-quote-double-interpolation": {
+      "name": "string.quoted.double.cs",
+      "begin": "\\$\\$\"\"\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-raw-interpolation"
+        }
+      ]
+    },
+    "raw-interpolated-string-quadruple-quote-single-interpolation": {
+      "name": "string.quoted.double.cs",
+      "begin": "\\$\"\"\"\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#raw-interpolation"
+        }
+      ]
+    },
+    "raw-interpolated-string-quadruple-quote-double-interpolation": {
+      "name": "string.quoted.double.cs",
+      "begin": "\\$\\$\"\"\"\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-raw-interpolation"
+        }
+      ]
+    },
+    "raw-interpolated-string-three-or-more-quote-three-or-more-interpolation": {
+      "name": "string.quoted.double.cs",
+      "begin": "\\$\\$\\$+\"\"\"+",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"+",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      }
+    },
+    "raw-interpolated-string-five-or-more-quote-one-or-more-interpolation": {
+      "name": "string.quoted.double.cs",
+      "begin": "\\$+\"\"\"\"\"+",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"\"\"+",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      }
+    },
+    "raw-interpolation": {
+      "name": "meta.interpolation.cs",
+      "begin": "(?<=[^\\{]|^)((?:\\{)*)(\\{)(?=[^\\{])",
+      "beginCaptures": {
+        "1": {
+          "name": "string.quoted.double.cs"
+        },
+        "2": {
+          "name": "punctuation.definition.interpolation.begin.cs"
+        }
+      },
+      "end": "\\}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.interpolation.end.cs"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ]
+    },
+    "double-raw-interpolation": {
+      "name": "meta.interpolation.cs",
+      "begin": "(?<=[^\\{][^\\{]|^)((?:\\{)*)(\\{\\{)(?=[^\\{])",
+      "beginCaptures": {
+        "1": {
+          "name": "string.quoted.double.cs"
+        },
+        "2": {
+          "name": "punctuation.definition.interpolation.begin.cs"
+        }
+      },
+      "end": "\\}\\}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.interpolation.end.cs"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ]
+    },
     "literal": {
       "patterns": [
         {
@@ -2794,6 +2975,9 @@
         {
           "include": "#char-literal"
         },
+        {
+          "include": "#raw-string-literal"
+        },
         {
           "include": "#string-literal"
         },
@@ -3055,6 +3239,64 @@
       "name": "constant.character.escape.cs",
       "match": "\"\""
     },
+    "raw-string-literal": {
+      "patterns": [
+        {
+          "include": "#raw-string-literal-more"
+        },
+        {
+          "include": "#raw-string-literal-quadruple"
+        },
+        {
+          "include": "#raw-string-literal-triple"
+        }
+      ]
+    },
+    "raw-string-literal-triple": {
+      "name": "string.quoted.double.cs",
+      "begin": "\"\"\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      }
+    },
+    "raw-string-literal-quadruple": {
+      "name": "string.quoted.double.cs",
+      "begin": "\"\"\"\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      }
+    },
+    "raw-string-literal-more": {
+      "name": "string.quoted.double.cs",
+      "begin": "\"\"\"\"\"+",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.cs"
+        }
+      },
+      "end": "\"\"\"\"\"+",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.cs"
+        }
+      }
+    },
     "tuple-literal": {
       "begin": "(\\()(?=.*[:,])",
       "beginCaptures": {
diff --git a/packages/shiki/languages/dart.tmLanguage.json b/packages/shiki/languages/dart.tmLanguage.json
index a5a6d5403..a41ee1943 100644
--- a/packages/shiki/languages/dart.tmLanguage.json
+++ b/packages/shiki/languages/dart.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/dart-lang/dart-syntax-highlight/commit/9d4857e114b7000d94232d83187ad142961c678a",
+  "version": "https://github.com/dart-lang/dart-syntax-highlight/commit/bd5cbdfe533c455a7ff7875923c4a94a5b497382",
   "name": "dart",
   "scopeName": "source.dart",
   "patterns": [
@@ -230,7 +230,15 @@
     "class-identifier": {
       "patterns": [
         {
-          "match": "(?<![a-zA-Z0-9_$])([_$]*[A-Z][a-zA-Z0-9_$]*(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?|bool\\b|num\\b|int\\b|double\\b|dynamic\\b|(void)\\b)",
+          "name": "storage.type.primitive.dart",
+          "match": "\\bvoid\\b"
+        },
+        {
+          "name": "support.class.dart",
+          "match": "\\b(bool|num|int|double|dynamic)\\b"
+        },
+        {
+          "match": "\\b([_$]*[A-Z][a-zA-Z0-9_$]*)(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?",
           "captures": {
             "1": {
               "name": "support.class.dart"
@@ -241,9 +249,6 @@
                   "include": "#type-args"
                 }
               ]
-            },
-            "3": {
-              "name": "storage.type.primitive.dart"
             }
           }
         }
diff --git a/packages/shiki/languages/fsharp.tmLanguage.json b/packages/shiki/languages/fsharp.tmLanguage.json
index 426e26760..cc237c9be 100644
--- a/packages/shiki/languages/fsharp.tmLanguage.json
+++ b/packages/shiki/languages/fsharp.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/ionide/ionide-fsgrammar/commit/e177bd7f9d3402f70d2f1fb42c74057ed1ccf6fa",
+  "version": "https://github.com/ionide/ionide-fsgrammar/commit/713cd4a34e7729e444cf85ae287dd94c19e34337",
   "name": "fsharp",
   "scopeName": "source.fsharp",
   "patterns": [
@@ -928,7 +928,7 @@
       "patterns": [
         {
           "name": "binding.fsharp",
-          "begin": "\\b(let mutable|static let mutable|static let|let inline|let|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
+          "begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
           "end": "\\s*(with\\b|=|\\n+=|(?<=\\=))",
           "beginCaptures": {
             "1": {
@@ -960,7 +960,7 @@
         },
         {
           "name": "binding.fsharp",
-          "begin": "\\b(use|use\\!|and|and!)\\s*(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
+          "begin": "\\b(use|use!|and|and!)\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
           "end": "\\s*(=)",
           "beginCaptures": {
             "1": {
diff --git a/packages/shiki/languages/javascript.tmLanguage.json b/packages/shiki/languages/javascript.tmLanguage.json
index 58a8a5054..63d9102d8 100644
--- a/packages/shiki/languages/javascript.tmLanguage.json
+++ b/packages/shiki/languages/javascript.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/0dfae8cc4807fecfbf8f1add095d9817df824c95",
+  "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/73af17bf3e45339df06d92751ab366ce96c38516",
   "name": "javascript",
   "scopeName": "source.js",
   "patterns": [
@@ -3053,7 +3053,7 @@
           "name": "keyword.operator.expression.instanceof.js"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
       "patterns": [
         {
           "include": "#type"
@@ -3077,7 +3077,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js"
@@ -5811,10 +5811,6 @@
               "name": "punctuation.definition.entity.js"
             }
           }
-        },
-        {
-          "name": "invalid.illegal.bad-ampersand.js",
-          "match": "&"
         }
       ]
     },
diff --git a/packages/shiki/languages/jsx.tmLanguage.json b/packages/shiki/languages/jsx.tmLanguage.json
index e4db17f88..a7cc37d01 100644
--- a/packages/shiki/languages/jsx.tmLanguage.json
+++ b/packages/shiki/languages/jsx.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/0dfae8cc4807fecfbf8f1add095d9817df824c95",
+  "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/73af17bf3e45339df06d92751ab366ce96c38516",
   "name": "jsx",
   "scopeName": "source.js.jsx",
   "patterns": [
@@ -3053,7 +3053,7 @@
           "name": "keyword.operator.expression.instanceof.js.jsx"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
       "patterns": [
         {
           "include": "#type"
@@ -3077,7 +3077,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js.jsx"
@@ -5811,10 +5811,6 @@
               "name": "punctuation.definition.entity.js.jsx"
             }
           }
-        },
-        {
-          "name": "invalid.illegal.bad-ampersand.js.jsx",
-          "match": "&"
         }
       ]
     },
diff --git a/packages/shiki/languages/latex.tmLanguage.json b/packages/shiki/languages/latex.tmLanguage.json
index a6227af4d..fe907f1b3 100644
--- a/packages/shiki/languages/latex.tmLanguage.json
+++ b/packages/shiki/languages/latex.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/jlelong/vscode-latex-basics/commit/7b08daed22963695616ef432c9d027427da5f450",
+  "version": "https://github.com/jlelong/vscode-latex-basics/commit/6fc051150e918f8e5df7b102977d8d72eedf66f6",
   "name": "latex",
   "scopeName": "text.tex.latex",
   "patterns": [
@@ -119,7 +119,7 @@
         "1": {
           "patterns": [
             {
-              "include": "#env-mandatory-arg"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -160,12 +160,12 @@
       },
       "patterns": [
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:cpp|c)\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:c|cpp)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
@@ -179,145 +179,145 @@
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{css\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:asy|asymptote)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
           },
-          "contentName": "source.css",
+          "contentName": "source.asy",
           "patterns": [
             {
-              "include": "source.css"
+              "include": "source.asy"
             }
           ],
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{html\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:css)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
           },
-          "contentName": "text.html",
+          "contentName": "source.css",
           "patterns": [
             {
-              "include": "text.html.basic"
+              "include": "source.css"
             }
           ],
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{java\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:hs|haskell)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
           },
-          "contentName": "source.java",
+          "contentName": "source.haskell",
           "patterns": [
             {
-              "include": "source.java"
+              "include": "source.haskell"
             }
           ],
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:js|javascript)\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:html)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
           },
-          "contentName": "source.js",
+          "contentName": "text.html",
           "patterns": [
             {
-              "include": "source.js"
+              "include": "text.html.basic"
             }
           ],
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:ts|typescript)\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:xml)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
           },
-          "contentName": "source.ts",
+          "contentName": "text.xml",
           "patterns": [
             {
-              "include": "source.ts"
+              "include": "text.xml"
             }
           ],
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{lua\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:java)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
           },
-          "contentName": "source.lua",
+          "contentName": "source.java",
           "patterns": [
             {
-              "include": "source.lua"
+              "include": "source.java"
             }
           ],
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:python|py)\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:lua)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
           },
-          "contentName": "source.python",
+          "contentName": "source.lua",
           "patterns": [
             {
-              "include": "source.python"
+              "include": "source.lua"
             }
           ],
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(julia)\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:jl|julia)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
@@ -331,12 +331,12 @@
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(ruby)\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:rb|ruby)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
@@ -350,31 +350,69 @@
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{xml\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:js|javascript)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
           },
-          "contentName": "text.xml",
+          "contentName": "source.js",
           "patterns": [
             {
-              "include": "text.xml"
+              "include": "source.js"
             }
           ],
           "end": "(\\\\end\\{minted\\})"
         },
         {
-          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{yaml\\})",
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:ts|typescript)\\})",
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
+                }
+              ]
+            }
+          },
+          "contentName": "source.ts",
+          "patterns": [
+            {
+              "include": "source.ts"
+            }
+          ],
+          "end": "(\\\\end\\{minted\\})"
+        },
+        {
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:py|python)\\})",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "#begin-env-tokenizer"
+                }
+              ]
+            }
+          },
+          "contentName": "source.python",
+          "patterns": [
+            {
+              "include": "source.python"
+            }
+          ],
+          "end": "(\\\\end\\{minted\\})"
+        },
+        {
+          "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:yaml)\\})",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
@@ -393,7 +431,7 @@
             "1": {
               "patterns": [
                 {
-                  "include": "#env-mandatory-arg"
+                  "include": "#begin-env-tokenizer"
                 }
               ]
             }
@@ -405,12 +443,12 @@
       ]
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{(cppcode(?:\\*)?)\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:cppcode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -419,20 +457,17 @@
       "patterns": [
         {
           "include": "source.cpp.embedded.latex"
-        },
-        {
-          "include": "source.cpp"
         }
       ],
       "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{(hscode(?:\\*)?)\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:hscode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -446,12 +481,12 @@
       "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{(luacode(?:\\*)?)\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:luacode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -465,12 +500,31 @@
       "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{((?:julia|jl)(?:code|verbatim|block|concode|console|converbatim)(?:\\*)?)\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
+        }
+      },
+      "contentName": "source.julia",
+      "patterns": [
+        {
+          "include": "source.julia"
+        }
+      ],
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+    },
+    {
+      "begin": "(\\s*\\\\begin\\{((?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -484,12 +538,12 @@
       "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{((?:(?:(?:py|pylab|sympy)(?:code|verbatim|block|concode|console|converbatim))|sageblock|sagesilent|sageverbatim|sageexample|sagecommandline)(?:\\*)?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+      "begin": "(\\s*\\\\begin\\{((?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#env-mandatory-arg"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -503,44 +557,88 @@
       "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{(scalacode(?:\\*)?)\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
       },
-      "contentName": "source.scala",
+      "contentName": "source.python",
       "patterns": [
         {
-          "include": "source.scala"
+          "include": "source.python"
         }
       ],
       "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{([a-z]*code(?:\\*)?)\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
       },
+      "contentName": "source.python",
+      "patterns": [
+        {
+          "include": "source.python"
+        }
+      ],
       "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{asy\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
+            }
+          ]
+        }
+      },
+      "contentName": "source.python",
+      "patterns": [
+        {
+          "include": "source.python"
+        }
+      ],
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+    },
+    {
+      "begin": "(\\s*\\\\begin\\{((?:scalacode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
+        }
+      },
+      "contentName": "source.scala",
+      "patterns": [
+        {
+          "include": "source.scala"
+        }
+      ],
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+    },
+    {
+      "begin": "(\\s*\\\\begin\\{((?:asy|asycode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -551,15 +649,15 @@
           "include": "source.asymptote"
         }
       ],
-      "end": "(\\\\end\\{asy\\}(?:\\s*\\n)?)"
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{dot2tex\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:dot2tex|dotcode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -570,15 +668,15 @@
           "include": "source.dot"
         }
       ],
-      "end": "(\\\\end\\{dot2tex\\}(?:\\s*\\n)?)"
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{gnuplot\\}(?:\\[.*\\])?)",
+      "begin": "(\\s*\\\\begin\\{((?:gnuplot)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
       "captures": {
         "1": {
           "patterns": [
             {
-              "include": "#code-env"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -589,7 +687,20 @@
           "include": "source.gnuplot"
         }
       ],
-      "end": "(\\\\end\\{gnuplot\\}(?:\\s*\\n)?)"
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
+    },
+    {
+      "begin": "((?:\\s*)\\\\begin\\{([a-z]*code(?:\\*)?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
+        }
+      },
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)"
     },
     {
       "begin": "((\\\\)addplot)(?:\\+?)((?:\\[[^\\[]*\\]))*\\s*(gnuplot)\\s*((?:\\[[^\\[]*\\]))*\\s*(\\{)",
@@ -639,81 +750,48 @@
       "end": "\\s*(\\};)"
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:fboxv|boxedv|V|v|spv)erbatim\\*?)(\\})",
+      "begin": "(\\s*\\\\begin\\{((?:fboxv|boxedv|V|v|spv)erbatim\\*?)\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
       "contentName": "markup.raw.verbatim.latex",
-      "end": "((\\\\)end)(\\{)(\\4)(\\})",
+      "end": "(\\\\end\\{\\2\\})",
       "name": "meta.function.verbatim.latex"
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(VerbatimOut)(\\})(\\{)([^\\}]*)(\\})",
+      "begin": "(\\s*\\\\begin\\{VerbatimOut\\}\\{[^\\}]*\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
-        },
-        "6": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "7": {
-          "name": "support.class.latex"
-        },
-        "8": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
       "contentName": "markup.raw.verbatim.latex",
-      "end": "((\\\\)end)(\\{)(\\VerbatimOut)(\\})",
+      "end": "(\\\\end\\{\\VerbatimOut\\})",
       "name": "meta.function.verbatim.latex"
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(alltt)(\\})",
+      "begin": "(\\s*\\\\begin\\{alltt\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
       "contentName": "markup.raw.verbatim.latex",
-      "end": "((\\\\)end)(\\{)(alltt)(\\})",
+      "end": "(\\\\end\\{alltt\\})",
       "name": "meta.function.alltt.latex",
       "patterns": [
         {
@@ -728,26 +806,18 @@
       ]
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:C|c)omment)(\\})",
+      "begin": "(\\s*\\\\begin\\{([Cc]omment)\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
       "contentName": "punctuation.definition.comment.latex",
-      "end": "((\\\\)end)(\\{)(\\4)(\\})",
+      "end": "(\\\\end\\{\\2\\})",
       "name": "meta.function.verbatim.latex"
     },
     {
@@ -772,47 +842,31 @@
       "name": "meta.function.link.url.latex"
     },
     {
+      "comment": "These two patterns match the \\begin{document} and \\end{document} commands, so that the environment matching pattern following them will ignore those commands.",
+      "match": "(\\s*\\\\begin\\{document\\})",
+      "name": "meta.function.begin-document.latex",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
-      },
-      "comment": "These two patterns match the \\begin{document} and \\end{document} commands, so that the environment matching pattern following them will ignore those commands.",
-      "match": "(?:\\s*)((\\\\)begin)(\\{)(document)(\\})",
-      "name": "meta.function.begin-document.latex"
+      }
     },
     {
+      "match": "(\\s*\\\\end\\{document\\})",
+      "name": "meta.function.end-document.latex",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
-      },
-      "match": "(?:\\s*)((\\\\)end)(\\{)(document)(\\})",
-      "name": "meta.function.end-document.latex"
+      }
     },
     {
       "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:array|equation|(?:IEEE)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|cases|(?:display)?math|[a-zA-Z]*matrix|[pbBvV]?NiceMatrix|[pbBvV]?NiceArray|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?",
@@ -862,7 +916,7 @@
         "1": {
           "patterns": [
             {
-              "include": "#env-mandatory-arg"
+              "include": "#begin-env-tokenizer"
             }
           ]
         }
@@ -891,26 +945,18 @@
       ]
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?)(\\})(\\s*\\n)?",
+      "begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?)\\}(\\s*\\n)?)",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
       "contentName": "meta.data.environment.tabular.latex",
-      "end": "(?:\\s*)((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?",
+      "end": "(\\s*\\\\end\\{(\\2)\\}(?:\\s*\\n)?)",
       "name": "meta.function.environment.tabular.latex",
       "patterns": [
         {
@@ -927,25 +973,17 @@
       ]
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(itemize|enumerate|description|list)(\\})",
+      "begin": "(\\s*\\\\begin\\{(itemize|enumerate|description|list)\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
-      "end": "((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?",
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)",
       "name": "meta.function.environment.list.latex",
       "patterns": [
         {
@@ -954,25 +992,17 @@
       ]
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(tikzpicture)(\\})",
+      "begin": "(\\s*\\\\begin\\{tikzpicture\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
-      "end": "((\\\\)end)(\\{)(tikzpicture)(\\})(?:\\s*\\n)?",
+      "end": "(\\\\end\\{tikzpicture\\}(?:\\s*\\n)?)",
       "name": "meta.function.environment.latex.tikz",
       "patterns": [
         {
@@ -981,25 +1011,17 @@
       ]
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(frame)(\\})",
+      "begin": "(\\s*\\\\begin\\{frame\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
-      "end": "((\\\\)end)(\\{)(frame)(\\})",
+      "end": "(\\\\end\\{frame\\})",
       "name": "meta.function.environment.frame.latex",
       "patterns": [
         {
@@ -1008,47 +1030,31 @@
       ]
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(mpost[*]?)(\\})",
+      "begin": "(\\s*\\\\begin\\{(mpost\\*?)\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
-      "end": "((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?",
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)",
       "name": "meta.function.environment.latex.mpost"
     },
     {
-      "begin": "(?:\\s*)?((\\\\)begin(\\{)(markdown)\\})",
+      "begin": "(\\s*\\\\begin\\{markdown\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
-      "end": "((\\\\)end)(\\{)(markdown)(\\})",
+      "end": "(\\\\end\\{markdown\\})",
       "contentName": "meta.embedded.markdown_latex_combined",
       "patterns": [
         {
@@ -1057,25 +1063,17 @@
       ]
     },
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(\\w+[*]?)(\\})",
+      "begin": "(\\s*\\\\begin\\{(\\w+\\*?)\\})",
       "captures": {
         "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
         }
       },
-      "end": "((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?",
+      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)",
       "name": "meta.function.environment.general.latex",
       "patterns": [
         {
@@ -1396,7 +1394,7 @@
       ]
     },
     {
-      "begin": "((\\\\)(?:\\w*[r|R]ef\\*?))(\\{)",
+      "begin": "((\\\\)(?:\\w*[rR]ef\\*?))(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.ref.latex"
@@ -1603,7 +1601,7 @@
           "name": "punctuation.definition.verb.latex"
         }
       },
-      "match": "((\\\\)(?:py|pycon|pylab|pylabcon|sympy|sympycon)[cv]?)((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))",
+      "match": "((\\\\)(?:(?:py|pycon|pylab|pylabcon|sympy|sympycon)[cv]?|pyq|pycq|pyif))((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))",
       "name": "meta.function.verb.latex"
     },
     {
@@ -1839,7 +1837,7 @@
         }
       ]
     },
-    "env-mandatory-arg": {
+    "begin-env-tokenizer": {
       "captures": {
         "1": {
           "name": "support.function.be.latex"
@@ -1879,33 +1877,7 @@
           "name": "punctuation.definition.arguments.end.latex"
         }
       },
-      "match": "((\\\\)(?:begin|end))(\\{)([a-z]*)(\\})(?:(\\[)(.*)(\\]))?(?:(\\{)([^{}]*)(\\}))?"
-    },
-    "code-env": {
-      "captures": {
-        "1": {
-          "name": "support.function.be.latex"
-        },
-        "2": {
-          "name": "punctuation.definition.function.latex"
-        },
-        "3": {
-          "name": "punctuation.definition.arguments.begin.latex"
-        },
-        "4": {
-          "name": "variable.parameter.function.latex"
-        },
-        "5": {
-          "name": "punctuation.definition.arguments.end.latex"
-        },
-        "6": {
-          "name": "punctuation.definition.arguments.optional.begin.latex"
-        },
-        "7": {
-          "name": "punctuation.definition.arguments.optional.end.latex"
-        }
-      },
-      "match": "(?:\\s*)((\\\\)(?:begin|end))(\\{)([a-z]+(?:\\*)?)(\\})(?:(\\[).*(\\]))?"
+      "match": "\\s*((\\\\)(?:begin|end))(\\{)([a-zA-Z]*\\*?)(\\})(?:(\\[)(.*)(\\]))?(?:(\\{)([^{}]*)(\\}))?"
     },
     "definition-label": {
       "begin": "((\\\\)label)((?:\\[[^\\[]*?\\])*)(\\{)",
diff --git a/packages/shiki/languages/markdown.tmLanguage.json b/packages/shiki/languages/markdown.tmLanguage.json
index d3d84186c..4a68d9cba 100644
--- a/packages/shiki/languages/markdown.tmLanguage.json
+++ b/packages/shiki/languages/markdown.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/69d3321b4923ca2d5e8e900018887cc38b5fe04a",
+  "version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/97f2f8d38f10d3febd77d85b745945dc60fe334e",
   "name": "markdown",
   "scopeName": "text.html.markdown",
   "patterns": [
@@ -2766,7 +2766,24 @@
           "name": "punctuation.definition.link.title.begin.markdown"
         },
         "2": {
-          "name": "string.other.link.title.markdown"
+          "name": "string.other.link.title.markdown",
+          "patterns": [
+            {
+              "include": "#raw"
+            },
+            {
+              "include": "#bold"
+            },
+            {
+              "include": "#italic"
+            },
+            {
+              "include": "#strikethrough"
+            },
+            {
+              "include": "#image-inline"
+            }
+          ]
         },
         "4": {
           "name": "punctuation.definition.link.title.end.markdown"
@@ -2826,7 +2843,24 @@
           "name": "punctuation.definition.link.title.begin.markdown"
         },
         "2": {
-          "name": "string.other.link.title.markdown"
+          "name": "string.other.link.title.markdown",
+          "patterns": [
+            {
+              "include": "#raw"
+            },
+            {
+              "include": "#bold"
+            },
+            {
+              "include": "#italic"
+            },
+            {
+              "include": "#strikethrough"
+            },
+            {
+              "include": "#image-inline"
+            }
+          ]
         },
         "4": {
           "name": "punctuation.definition.link.title.end.markdown"
@@ -2957,7 +2991,7 @@
           "name": "punctuation.definition.strikethrough.markdown"
         }
       },
-      "match": "(~{2,})((?:[^~]|(?!(?<!~)\\1(?!~))~)*+)(\\1)",
+      "match": "(?<!\\\\)(~{2,})((?:[^~]|(?!(?<![~\\\\])\\1(?!~))~)*+)(\\1)",
       "name": "markup.strikethrough.markdown"
     }
   }
diff --git a/packages/shiki/languages/mermaid.tmLanguage.json b/packages/shiki/languages/mermaid.tmLanguage.json
index 27a6e9f36..6786f0255 100644
--- a/packages/shiki/languages/mermaid.tmLanguage.json
+++ b/packages/shiki/languages/mermaid.tmLanguage.json
@@ -473,6 +473,151 @@
           ],
           "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)"
         },
+        {
+          "comment": "Git Graph",
+          "begin": "^\\s*(gitGraph)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.mermaid"
+            }
+          },
+          "patterns": [
+            {
+              "match": "\\%%.*",
+              "name": "comment"
+            },
+            {
+              "comment": "commit",
+              "begin": "\\s*(commit)",
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.control.mermaid"
+                }
+              },
+              "patterns": [
+                {
+                  "comment": "(id)(:) (\"id\")",
+                  "match": "\\s*(id)(:)\\s?(\"[^\"\\n]*\")",
+                  "captures": {
+                    "1": {
+                      "name": "keyword.control.mermaid"
+                    },
+                    "2": {
+                      "name": "keyword.control.mermaid"
+                    },
+                    "3": {
+                      "name": "string"
+                    }
+                  }
+                },
+                {
+                  "comment": "(type)(:) (COMMIT_TYPE)",
+                  "match": "\\s*(type)(:)\\s?(NORMAL|REVERSE|HIGHLIGHT)",
+                  "captures": {
+                    "1": {
+                      "name": "keyword.control.mermaid"
+                    },
+                    "2": {
+                      "name": "keyword.control.mermaid"
+                    },
+                    "3": {
+                      "name": "entity.name.function.mermaid"
+                    }
+                  }
+                },
+                {
+                  "comment": "(tag)(:) (\"tag\")",
+                  "match": "\\s*(tag)(:)\\s?(\"[\\($&%\\^/#.,?!;:*+=<>\\'\\\\\\-\\w\\s]*\")",
+                  "captures": {
+                    "1": {
+                      "name": "keyword.control.mermaid"
+                    },
+                    "2": {
+                      "name": "keyword.control.mermaid"
+                    },
+                    "3": {
+                      "name": "string"
+                    }
+                  }
+                }
+              ],
+              "end": "$"
+            },
+            {
+              "comment": "(checkout) (branch-name)",
+              "match": "\\s*(checkout)\\s*([^\\s\"]*)",
+              "captures": {
+                "1": {
+                  "name": "keyword.control.mermaid"
+                },
+                "2": {
+                  "name": "variable"
+                }
+              }
+            },
+            {
+              "comment": "(branch) (branch-name) (order)?(:) (number)",
+              "match": "\\s*(branch)\\s*([^\\s\"]*)\\s*(?:(order)(:)\\s?(\\d+))?",
+              "captures": {
+                "1": {
+                  "name": "keyword.control.mermaid"
+                },
+                "2": {
+                  "name": "variable"
+                },
+                "3": {
+                  "name": "keyword.control.mermaid"
+                },
+                "4": {
+                  "name": "keyword.control.mermaid"
+                },
+                "5": {
+                  "name": "constant.numeric.decimal.mermaid"
+                }
+              }
+            },
+            {
+              "comment": "(merge) (branch-name) (tag: \"tag-name\")?",
+              "match": "\\s*(merge)\\s*([^\\s\"]*)\\s*(?:(tag)(:)\\s?(\"[^\"\\n]*\"))?",
+              "captures": {
+                "1": {
+                  "name": "keyword.control.mermaid"
+                },
+                "2": {
+                  "name": "variable"
+                },
+                "3": {
+                  "name": "keyword.control.mermaid"
+                },
+                "4": {
+                  "name": "keyword.control.mermaid"
+                },
+                "5": {
+                  "name": "string"
+                }
+              }
+            },
+            {
+              "comment": "(cherry-pick) (id)(:)(\"commit-id\")",
+              "match": "\\s*(cherry-pick)\\s+(id)(:)\\s*(\"[^\"\\n]*\")",
+              "captures": {
+                "1": {
+                  "name": "keyword.control.mermaid"
+                },
+                "2": {
+                  "name": "keyword.control.mermaid"
+                },
+                "3": {
+                  "name": "keyword.control.mermaid"
+                },
+                "4": {
+                  "name": "string"
+                }
+              }
+            }
+          ],
+          "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)"
+        },
         {
           "comment": "Graph",
           "begin": "^\\s*(graph|flowchart)\\s+([A-Za-z\\ 0-9]+)",
@@ -523,7 +668,7 @@
                 },
                 {
                   "comment": "(Graph Link Text)?(Graph Link)(Entity To)?(Edge/Shape)?(Text)?(Edge/Shape)?",
-                  "match": "(\\s*(?:\"[^\"]+\")|(?:[\\($&%\\^/#.,?!;:*+<>_\\'\\\\\\w\\s]*))?\\s*(-?-[-\\>]\\|?|=?=[=\\>]|(?:\\.-|-\\.)-?\\>?|\\|)(\\s*[-\\w]+\\b)(\\[|\\(+|\\>|\\{)?(\\s*[-\\w]+\\b)?(\\]|\\)+|\\})?",
+                  "match": "(\\s*(?:\"[^\"]+\")|(?:[\\($&%\\^/#.,?!;:*+<>_\\'\\\\\\w\\s]*))?\\s*(-?-[-\\>]\\|?|=?=[=\\>]|(?:\\.-|-\\.)-?\\>?|\\|)(\\s*[-\\w]+\\b)(\\(\\[|\\[\\[|\\[\\(|\\[|\\(+|\\>|\\{|\\(\\()?\\s*([^\\]\\)\\}\\n]+)?(\\]\\)|\\]\\]|\\)\\]|\\]|\\)+|\\}|\\)\\))?",
                   "captures": {
                     "1": {
                       "name": "string"
@@ -547,7 +692,7 @@
                 },
                 {
                   "comment": "(Entity To)(Edge/Shape)?(Text)?(Edge/Shape)?",
-                  "match": "(\\s*[-\\w]+\\b)(\\[|\\(+|\\>|\\{)?(\\s*[-\\w]+\\b)?(\\]|\\)+|\\})?",
+                  "match": "(\\s*[-\\w]+\\b)(\\(\\[|\\[\\[|\\[\\(|\\[|\\(+|\\>|\\{|\\(\\()?\\s*([^\\]\\)\\}\\n]+)?(\\]\\)|\\]\\]|\\)\\]|\\]|\\)+|\\}|\\)\\))?",
                   "captures": {
                     "1": {
                       "name": "variable"
@@ -568,7 +713,7 @@
             },
             {
               "comment": "(Entity)(Edge/Shape)(Text)(Edge/Shape)",
-              "begin": "(\\b[-\\w]+\\b\\s*)(\\[|\\(+|\\>|\\{|\\(\\()(\\s*(?:\"[^\"]+\")|(?:[$&%\\^/#.,?!;:*+<>_\\'\\\\\\w\\s]*))(\\]|\\)+|\\}|\\)\\))",
+              "begin": "(\\b[-\\w]+\\b\\s*)(\\(\\[|\\[\\[|\\[\\(|\\[|\\(+|\\>|\\{|\\(\\()(\\s*(?:\"[^\"]+\")|(?:[$&%\\^/#.,?!;:*+<>_\\'\\\\\\w\\s]*))(\\]\\)|\\]\\]|\\)\\]|\\]|\\)+|\\}|\\)\\))",
               "beginCaptures": {
                 "1": {
                   "name": "variable"
@@ -586,7 +731,7 @@
               "patterns": [
                 {
                   "comment": "(Entity)(Edge/Shape)(Text)(Edge/Shape)",
-                  "match": "(\\s*\\b[-\\w]+\\b\\s*)(\\[|\\(+|\\>|\\{)(\\s*[\"\\($&%\\^/#.,?!;:*+=<>\\'\\\\\\-\\w\\s]*)(\\]|\\)+|\\})",
+                  "match": "(\\s*\\b[-\\w]+\\b\\s*)(\\(\\[|\\[\\[|\\[\\(|\\[|\\(+|\\>|\\{|\\(\\()(\\s*[\"\\($&%\\^/#.,?!;:*+=<>\\'\\\\\\-\\w\\s]*)(\\]\\)|\\]\\]|\\)\\]|\\]|\\)+|\\}|\\)\\))",
                   "captures": {
                     "1": {
                       "name": "variable"
@@ -604,7 +749,7 @@
                 },
                 {
                   "comment": "(Graph Link)(Graph Link Text)(Graph Link)(Entity)(Edge/Shape)(Text)(Edge/Shape)",
-                  "match": "(\\s*-?-[-\\>]\\|?|=?=[=\\>]|(?:\\.-|-\\.)-?\\>?)(\\s*[-\\w\\s]+\\b)?(-?-[-\\>]\\|?|=?=[=\\>]|(?:\\.-|-\\.)-?\\>?|\\|)?(\\s*\\b[-\\w]+\\b\\s*)(\\[|\\(+|\\>|\\{)(\\s*[\"\\($&%\\^/#.,?!;:*+=<>\\'\\\\\\-\\w\\s]*)?(\\]|\\)+|\\})",
+                  "match": "(\\s*-?-[-\\>]\\|?|=?=[=\\>]|(?:\\.-|-\\.)-?\\>?)(\\s*[-\\w\\s]+\\b)?(-?-[-\\>]\\|?|=?=[=\\>]|(?:\\.-|-\\.)-?\\>?|\\|)?(\\s*\\b[-\\w]+\\b\\s*)(\\(\\[|\\[\\[|\\[\\(|\\[|\\(+|\\>|\\{|\\(\\()(\\s*[\"\\($&%\\^/#.,?!;:*+=<>\\'\\\\\\-\\w\\s]*)?(\\]\\)|\\]\\]|\\)\\]|\\]|\\)+|\\}|\\)\\))",
                   "captures": {
                     "1": {
                       "name": "keyword.control.mermaid"
@@ -746,8 +891,8 @@
               "name": "comment"
             },
             {
-              "comment": "(title)",
-              "match": "(title)\\s*(:)\\s+(\\s*[\"\\(\\)$&%\\^/#.,?!:*+=<>\\'\\\\\\-\\w\\s]*)",
+              "comment": "(title)(title text)",
+              "match": "(title)\\s*(:)?\\s+(\\s*[\"\\(\\)$&%\\^/#.,?!:*+=<>\\'\\\\\\-\\w\\s]*)",
               "captures": {
                 "1": {
                   "name": "keyword.control.mermaid"
@@ -762,7 +907,7 @@
             },
             {
               "comment": "(participant)(Actor)(as)?(Label)?",
-              "match": "\\s*(participant)\\s+([\"\\(\\)$&%\\^/#.?!*=<>\\'\\\\\\w\\s]+?)(?:\\s+(as))?\\s([\"\\(\\)$&%\\^/#.,?!*=<>\\'\\\\\\w\\s]+)?",
+              "match": "\\s*(participant|actor)\\s+((?:(?! as )[\"\\(\\)$&%\\^/#.?!*=<>\\'\\\\\\w\\s])+)\\s*(as)?\\s([\"\\(\\)$&%\\^/#.,?!*=<>\\'\\\\\\w\\s]+)?",
               "captures": {
                 "1": {
                   "name": "keyword.control.mermaid"
diff --git a/packages/shiki/languages/pug.tmLanguage.json b/packages/shiki/languages/pug.tmLanguage.json
index 24bae2296..9041cca82 100644
--- a/packages/shiki/languages/pug.tmLanguage.json
+++ b/packages/shiki/languages/pug.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/davidrios/pug-tmbundle/commit/e67e895f6fb64932aa122e471000fa55d826bff6",
+  "version": "https://github.com/davidrios/pug-tmbundle/commit/8d7e93262a949afca023ee67ca8bb01a3b43e607",
   "name": "pug",
   "scopeName": "text.pug",
   "patterns": [
@@ -656,7 +656,7 @@
         },
         {
           "begin": "=\\s*",
-          "end": "$|(?=,|(?:\\s+[^!%&*-+~|<>:?/])|\\))",
+          "end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>:?/])|\\))",
           "name": "attribute_value",
           "patterns": [
             {
@@ -677,8 +677,8 @@
           ]
         },
         {
-          "begin": "(?<=[%&*-+~|<>:?/])\\s+",
-          "end": "$|(?=,|(?:\\s+[^!%&*-+~|<>:?/])|\\))",
+          "begin": "(?<=[%&*\\-+~|<>:?/])\\s+",
+          "end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>:?/])|\\))",
           "name": "attribute_value2",
           "patterns": [
             {
diff --git a/packages/shiki/languages/tex.tmLanguage.json b/packages/shiki/languages/tex.tmLanguage.json
index eea262735..90c221d29 100644
--- a/packages/shiki/languages/tex.tmLanguage.json
+++ b/packages/shiki/languages/tex.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/jlelong/vscode-latex-basics/commit/b98c2d4911652824fc990f4b26c9c30be59b78a2",
+  "version": "https://github.com/jlelong/vscode-latex-basics/commit/8776a0856846b63d9e5765e8ec42a8a2f4f52219",
   "name": "tex",
   "scopeName": "text.tex",
   "patterns": [
@@ -167,7 +167,7 @@
           "name": "punctuation.math.bracket.pair.tex"
         },
         {
-          "match": "\\\\(left|right|((big|bigg|Big|Bigg)[lr]?))([\\(\\[\\<\\>\\]\\)\\.\\|]|\\\\[{}|]|\\\\[lr]?[Vv]ert|\\\\[lr]angle|\\\\\\|)",
+          "match": "\\\\(left|right|((big|bigg|Big|Bigg)[lr]?))([\\(\\[\\<\\>\\]\\)\\.\\|]|\\\\[{}|]|\\\\[lr]?[Vv]ert|\\\\[lr]angle)",
           "name": "punctuation.math.bracket.pair.big.tex"
         },
         {
diff --git a/packages/shiki/languages/tsx.tmLanguage.json b/packages/shiki/languages/tsx.tmLanguage.json
index 40ca8c4e0..440572c45 100644
--- a/packages/shiki/languages/tsx.tmLanguage.json
+++ b/packages/shiki/languages/tsx.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/0dfae8cc4807fecfbf8f1add095d9817df824c95",
+  "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/73af17bf3e45339df06d92751ab366ce96c38516",
   "name": "tsx",
   "scopeName": "source.tsx",
   "patterns": [
@@ -3053,7 +3053,7 @@
           "name": "keyword.operator.expression.instanceof.tsx"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
       "patterns": [
         {
           "include": "#type"
@@ -3077,7 +3077,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.tsx"
@@ -5811,10 +5811,6 @@
               "name": "punctuation.definition.entity.tsx"
             }
           }
-        },
-        {
-          "name": "invalid.illegal.bad-ampersand.tsx",
-          "match": "&"
         }
       ]
     },
diff --git a/packages/shiki/languages/typescript.tmLanguage.json b/packages/shiki/languages/typescript.tmLanguage.json
index 4ca0b649c..1af447670 100644
--- a/packages/shiki/languages/typescript.tmLanguage.json
+++ b/packages/shiki/languages/typescript.tmLanguage.json
@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/0dfae8cc4807fecfbf8f1add095d9817df824c95",
+  "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/73af17bf3e45339df06d92751ab366ce96c38516",
   "name": "typescript",
   "scopeName": "source.ts",
   "patterns": [
@@ -3050,7 +3050,7 @@
           "name": "keyword.operator.expression.instanceof.ts"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
       "patterns": [
         {
           "include": "#type"
@@ -3074,7 +3074,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
diff --git a/packages/shiki/src/languages.ts b/packages/shiki/src/languages.ts
index 6bfbc7891..b563ff8be 100644
--- a/packages/shiki/src/languages.ts
+++ b/packages/shiki/src/languages.ts
@@ -195,7 +195,7 @@ export const languages: ILanguageRegistration[] = [
     scopeName: 'source.astro',
     path: 'astro.tmLanguage.json',
     samplePath: 'astro.sample',
-    embeddedLangs: ['json', 'javascript', 'typescript', 'tsx', 'css', 'less', 'sass', 'scss', 'stylus', 'markdown']
+    embeddedLangs: ['json', 'javascript', 'typescript', 'tsx', 'css', 'less', 'sass', 'scss', 'stylus']
   },
   {
     id: 'awk',
@@ -543,7 +543,7 @@ export const languages: ILanguageRegistration[] = [
     id: 'latex',
     scopeName: 'text.tex.latex',
     path: 'latex.tmLanguage.json',
-    embeddedLangs: ['tex', 'css', 'html', 'java', 'javascript', 'typescript', 'lua', 'python', 'julia', 'ruby', 'xml', 'yaml', 'cpp', 'haskell', 'scala', 'gnuplot']
+    embeddedLangs: ['tex', 'css', 'haskell', 'html', 'xml', 'java', 'lua', 'julia', 'ruby', 'javascript', 'typescript', 'python', 'yaml', 'scala', 'gnuplot']
   },
   {
     id: 'less',
diff --git a/packages/shiki/themes/dark-plus.json b/packages/shiki/themes/dark-plus.json
index ba77ee651..a13c091bd 100644
--- a/packages/shiki/themes/dark-plus.json
+++ b/packages/shiki/themes/dark-plus.json
@@ -8,7 +8,7 @@
       }
     },
     {
-      "scope": ["meta.embedded", "source.groovy.embedded"],
+      "scope": ["meta.embedded", "source.groovy.embedded", "string meta.image.inline.markdown"],
       "settings": {
         "foreground": "#D4D4D4"
       }
@@ -559,6 +559,7 @@
     "sideBarSectionHeader.background": "#0000",
     "sideBarSectionHeader.border": "#ccc3",
     "tab.lastPinnedBorder": "#ccc3",
-    "list.activeSelectionIconForeground": "#FFF"
+    "list.activeSelectionIconForeground": "#FFF",
+    "terminal.inactiveSelectionBackground": "#3A3D41"
   }
 }
diff --git a/packages/shiki/themes/light-plus.json b/packages/shiki/themes/light-plus.json
index 834f036a9..7cf0e962c 100644
--- a/packages/shiki/themes/light-plus.json
+++ b/packages/shiki/themes/light-plus.json
@@ -8,7 +8,7 @@
       }
     },
     {
-      "scope": ["meta.embedded", "source.groovy.embedded"],
+      "scope": ["meta.embedded", "source.groovy.embedded", "string meta.image.inline.markdown"],
       "settings": {
         "foreground": "#000000ff"
       }
@@ -588,6 +588,7 @@
     "notebook.selectedCellBackground": "#c8ddf150",
     "statusBarItem.errorBackground": "#c72e0f",
     "list.activeSelectionIconForeground": "#FFF",
-    "list.focusAndSelectionOutline": "#90C2F9"
+    "list.focusAndSelectionOutline": "#90C2F9",
+    "terminal.inactiveSelectionBackground": "#E5EBF1"
   }
 }
diff --git a/packages/shiki/themes/monokai.json b/packages/shiki/themes/monokai.json
index 6545254e8..fe7a8c56c 100644
--- a/packages/shiki/themes/monokai.json
+++ b/packages/shiki/themes/monokai.json
@@ -102,7 +102,7 @@
       }
     },
     {
-      "scope": ["meta.embedded", "source.groovy.embedded"],
+      "scope": ["meta.embedded", "source.groovy.embedded", "string meta.image.inline.markdown"],
       "settings": {
         "foreground": "#F8F8F2"
       }
diff --git a/packages/shiki/themes/rose-pine-dawn.json b/packages/shiki/themes/rose-pine-dawn.json
index 8c9b8758b..b67edeb12 100644
--- a/packages/shiki/themes/rose-pine-dawn.json
+++ b/packages/shiki/themes/rose-pine-dawn.json
@@ -58,7 +58,9 @@
     "descriptionForeground": "#797593",
     "diffEditor.border": "#f2e9e1",
     "diffEditor.diagonalFill": "#6e6a8626",
+    "diffEditor.insertedLineBackground": "#56949f26",
     "diffEditor.insertedTextBackground": "#56949f26",
+    "diffEditor.removedLineBackground": "#b4637a26",
     "diffEditor.removedTextBackground": "#b4637a26",
     "diffEditorOverview.insertedForeground": "#56949f80",
     "diffEditorOverview.removedForeground": "#b4637a80",
@@ -205,6 +207,7 @@
     "extensionButton.prominentBackground": "#d7827e",
     "extensionButton.prominentForeground": "#faf4ed",
     "extensionButton.prominentHoverBackground": "#d7827ee6",
+    "extensionIcon.preReleaseForeground": "#286983",
     "extensionIcon.starForeground": "#d7827e",
     "extensionIcon.verifiedForeground": "#907aa9",
     "focusBorder": "#6e6a8614",
@@ -244,7 +247,6 @@
     "keybindingTable.rowsBackground": "#fffaf3",
     "list.activeSelectionBackground": "#6e6a8614",
     "list.activeSelectionForeground": "#575279",
-    "list.activeSelectionIconForeground": "#575279",
     "list.deemphasizedForeground": "#797593",
     "list.dropBackground": "#fffaf3",
     "list.errorForeground": "#b4637a",
@@ -259,7 +261,6 @@
     "list.inactiveFocusBackground": "#6e6a860d",
     "list.inactiveSelectionBackground": "#fffaf3",
     "list.inactiveSelectionForeground": "#575279",
-    "list.inactiveSelectionIconForeground": "#797593",
     "list.invalidItemForeground": "#b4637a",
     "list.warningForeground": "#ea9d34",
     "listFilterWidget.background": "#fffaf3",
diff --git a/packages/shiki/themes/rose-pine-moon.json b/packages/shiki/themes/rose-pine-moon.json
index 26eddfc29..3c271bfe1 100644
--- a/packages/shiki/themes/rose-pine-moon.json
+++ b/packages/shiki/themes/rose-pine-moon.json
@@ -58,7 +58,9 @@
     "descriptionForeground": "#908caa",
     "diffEditor.border": "#393552",
     "diffEditor.diagonalFill": "#817c9c4d",
+    "diffEditor.insertedLineBackground": "#9ccfd826",
     "diffEditor.insertedTextBackground": "#9ccfd826",
+    "diffEditor.removedLineBackground": "#eb6f9226",
     "diffEditor.removedTextBackground": "#eb6f9226",
     "diffEditorOverview.insertedForeground": "#9ccfd880",
     "diffEditorOverview.removedForeground": "#eb6f9280",
@@ -205,6 +207,7 @@
     "extensionButton.prominentBackground": "#ea9a97",
     "extensionButton.prominentForeground": "#232136",
     "extensionButton.prominentHoverBackground": "#ea9a97e6",
+    "extensionIcon.preReleaseForeground": "#3e8fb0",
     "extensionIcon.starForeground": "#ea9a97",
     "extensionIcon.verifiedForeground": "#c4a7e7",
     "focusBorder": "#817c9c26",
@@ -244,7 +247,6 @@
     "keybindingTable.rowsBackground": "#2a273f",
     "list.activeSelectionBackground": "#817c9c26",
     "list.activeSelectionForeground": "#e0def4",
-    "list.activeSelectionIconForeground": "#e0def4",
     "list.deemphasizedForeground": "#908caa",
     "list.dropBackground": "#2a273f",
     "list.errorForeground": "#eb6f92",
@@ -259,7 +261,6 @@
     "list.inactiveFocusBackground": "#817c9c14",
     "list.inactiveSelectionBackground": "#2a273f",
     "list.inactiveSelectionForeground": "#e0def4",
-    "list.inactiveSelectionIconForeground": "#908caa",
     "list.invalidItemForeground": "#eb6f92",
     "list.warningForeground": "#f6c177",
     "listFilterWidget.background": "#2a273f",
diff --git a/packages/shiki/themes/rose-pine.json b/packages/shiki/themes/rose-pine.json
index e1ac39443..2861549b6 100644
--- a/packages/shiki/themes/rose-pine.json
+++ b/packages/shiki/themes/rose-pine.json
@@ -58,7 +58,9 @@
     "descriptionForeground": "#908caa",
     "diffEditor.border": "#26233a",
     "diffEditor.diagonalFill": "#6e6a8666",
+    "diffEditor.insertedLineBackground": "#9ccfd826",
     "diffEditor.insertedTextBackground": "#9ccfd826",
+    "diffEditor.removedLineBackground": "#eb6f9226",
     "diffEditor.removedTextBackground": "#eb6f9226",
     "diffEditorOverview.insertedForeground": "#9ccfd880",
     "diffEditorOverview.removedForeground": "#eb6f9280",
@@ -205,6 +207,7 @@
     "extensionButton.prominentBackground": "#ebbcba",
     "extensionButton.prominentForeground": "#191724",
     "extensionButton.prominentHoverBackground": "#ebbcbae6",
+    "extensionIcon.preReleaseForeground": "#31748f",
     "extensionIcon.starForeground": "#ebbcba",
     "extensionIcon.verifiedForeground": "#c4a7e7",
     "focusBorder": "#6e6a8633",
@@ -244,7 +247,6 @@
     "keybindingTable.rowsBackground": "#1f1d2e",
     "list.activeSelectionBackground": "#6e6a8633",
     "list.activeSelectionForeground": "#e0def4",
-    "list.activeSelectionIconForeground": "#e0def4",
     "list.deemphasizedForeground": "#908caa",
     "list.dropBackground": "#1f1d2e",
     "list.errorForeground": "#eb6f92",
@@ -259,7 +261,6 @@
     "list.inactiveFocusBackground": "#6e6a861a",
     "list.inactiveSelectionBackground": "#1f1d2e",
     "list.inactiveSelectionForeground": "#e0def4",
-    "list.inactiveSelectionIconForeground": "#908caa",
     "list.invalidItemForeground": "#eb6f92",
     "list.warningForeground": "#f6c177",
     "listFilterWidget.background": "#1f1d2e",
diff --git a/packages/shiki/themes/solarized-dark.json b/packages/shiki/themes/solarized-dark.json
index 4b553aeb5..17630be1f 100644
--- a/packages/shiki/themes/solarized-dark.json
+++ b/packages/shiki/themes/solarized-dark.json
@@ -7,7 +7,7 @@
       }
     },
     {
-      "scope": ["meta.embedded", "source.groovy.embedded"],
+      "scope": ["meta.embedded", "source.groovy.embedded", "string meta.image.inline.markdown"],
       "settings": {
         "foreground": "#839496"
       }
diff --git a/packages/shiki/themes/solarized-light.json b/packages/shiki/themes/solarized-light.json
index aba7b730a..c55d2938c 100644
--- a/packages/shiki/themes/solarized-light.json
+++ b/packages/shiki/themes/solarized-light.json
@@ -7,7 +7,7 @@
       }
     },
     {
-      "scope": ["meta.embedded", "source.groovy.embedded"],
+      "scope": ["meta.embedded", "source.groovy.embedded", "string meta.image.inline.markdown"],
       "settings": {
         "foreground": "#657B83"
       }
diff --git a/packages/shiki/themes/vitesse-dark.json b/packages/shiki/themes/vitesse-dark.json
index f7f4c5aec..1f1822e34 100644
--- a/packages/shiki/themes/vitesse-dark.json
+++ b/packages/shiki/themes/vitesse-dark.json
@@ -17,7 +17,7 @@
     "button.foreground": "#121212",
     "button.hoverBackground": "#4d9375",
     "checkbox.background": "#181818",
-    "checkbox.border": "#111",
+    "checkbox.border": "#2f363d",
     "dropdown.background": "#121212",
     "dropdown.border": "#191919",
     "dropdown.foreground": "#dbd7caee",
@@ -203,11 +203,10 @@
         "delimiter.bracket",
         "delimiter",
         "invalid.illegal.character-not-allowed-here.html",
-        "keyword.operator.assignment",
-        "keyword.operator.assignment",
         "keyword.operator.rest",
         "keyword.operator.spread",
         "keyword.operator.type.annotation",
+        "keyword.operator.relational.ts",
         "meta.brace",
         "meta.tag.block.any.html",
         "meta.tag.inline.any.html",
@@ -215,6 +214,7 @@
         "meta.type.annotation",
         "storage.type.function.arrow",
         "keyword.operator.type",
+        "meta.objectliteral.ts",
         "punctuation"
       ],
       "settings": {
@@ -287,17 +287,11 @@
       }
     },
     {
-      "scope": ["punctuation.definition.string"],
+      "scope": ["punctuation.definition.string", "punctuation.support.type.property-name"],
       "settings": {
         "foreground": "#c98a7daa"
       }
     },
-    {
-      "scope": ["punctuation.support.type.property-name"],
-      "settings": {
-        "foreground": "#b8a965aa"
-      }
-    },
     {
       "scope": "support",
       "settings": {
@@ -631,14 +625,6 @@
       "token": "invalid.illegal.character-not-allowed-here.html",
       "foreground": "666666"
     },
-    {
-      "token": "keyword.operator.assignment",
-      "foreground": "666666"
-    },
-    {
-      "token": "keyword.operator.assignment",
-      "foreground": "666666"
-    },
     {
       "token": "keyword.operator.rest",
       "foreground": "666666"
@@ -651,6 +637,10 @@
       "token": "keyword.operator.type.annotation",
       "foreground": "666666"
     },
+    {
+      "token": "keyword.operator.relational.ts",
+      "foreground": "666666"
+    },
     {
       "token": "meta.brace",
       "foreground": "666666"
@@ -679,6 +669,10 @@
       "token": "keyword.operator.type",
       "foreground": "666666"
     },
+    {
+      "token": "meta.objectliteral.ts",
+      "foreground": "666666"
+    },
     {
       "token": "punctuation",
       "foreground": "666666"
@@ -781,7 +775,7 @@
     },
     {
       "token": "punctuation.support.type.property-name",
-      "foreground": "b8a965aa"
+      "foreground": "c98a7daa"
     },
     {
       "token": "support",
diff --git a/packages/shiki/themes/vitesse-light.json b/packages/shiki/themes/vitesse-light.json
index 70a979c7f..aa06e93b9 100644
--- a/packages/shiki/themes/vitesse-light.json
+++ b/packages/shiki/themes/vitesse-light.json
@@ -201,11 +201,10 @@
         "delimiter.bracket",
         "delimiter",
         "invalid.illegal.character-not-allowed-here.html",
-        "keyword.operator.assignment",
-        "keyword.operator.assignment",
         "keyword.operator.rest",
         "keyword.operator.spread",
         "keyword.operator.type.annotation",
+        "keyword.operator.relational.ts",
         "meta.brace",
         "meta.tag.block.any.html",
         "meta.tag.inline.any.html",
@@ -213,6 +212,7 @@
         "meta.type.annotation",
         "storage.type.function.arrow",
         "keyword.operator.type",
+        "meta.objectliteral.ts",
         "punctuation"
       ],
       "settings": {
@@ -285,17 +285,11 @@
       }
     },
     {
-      "scope": ["punctuation.definition.string"],
+      "scope": ["punctuation.definition.string", "punctuation.support.type.property-name"],
       "settings": {
         "foreground": "#b56959aa"
       }
     },
-    {
-      "scope": ["punctuation.support.type.property-name"],
-      "settings": {
-        "foreground": "#998418aa"
-      }
-    },
     {
       "scope": "support",
       "settings": {
@@ -629,14 +623,6 @@
       "token": "invalid.illegal.character-not-allowed-here.html",
       "foreground": "999999"
     },
-    {
-      "token": "keyword.operator.assignment",
-      "foreground": "999999"
-    },
-    {
-      "token": "keyword.operator.assignment",
-      "foreground": "999999"
-    },
     {
       "token": "keyword.operator.rest",
       "foreground": "999999"
@@ -649,6 +635,10 @@
       "token": "keyword.operator.type.annotation",
       "foreground": "999999"
     },
+    {
+      "token": "keyword.operator.relational.ts",
+      "foreground": "999999"
+    },
     {
       "token": "meta.brace",
       "foreground": "999999"
@@ -677,6 +667,10 @@
       "token": "keyword.operator.type",
       "foreground": "999999"
     },
+    {
+      "token": "meta.objectliteral.ts",
+      "foreground": "999999"
+    },
     {
       "token": "punctuation",
       "foreground": "999999"
@@ -779,7 +773,7 @@
     },
     {
       "token": "punctuation.support.type.property-name",
-      "foreground": "998418aa"
+      "foreground": "b56959aa"
     },
     {
       "token": "support",
diff --git a/packages/vuepress-plugin/package.json b/packages/vuepress-plugin/package.json
index bb7a55974..a6ae7518e 100644
--- a/packages/vuepress-plugin/package.json
+++ b/packages/vuepress-plugin/package.json
@@ -18,6 +18,6 @@
     "url": "git+https://github.com/octref/shiki.git"
   },
   "dependencies": {
-    "shiki": "^0.10.1"
+    "shiki": "^0.11.0"
   }
 }